MCKIN-28611 - Nested blocks imports fix (#320)

Author: xitij2000

problem_builder/mentoring.py

@@ -335,9 +335,9 @@ def allowed_nested_blocks(self):
         """
         additional_blocks = []
         try:
-            from xmodule.video_module.video_module import VideoDescriptor
+            from xmodule.video_module.video_module import VideoBlock
             additional_blocks.append(NestedXBlockSpec(
-                VideoDescriptor, category='video', label=_(u"Video")
+                VideoBlock, category='video', label=_(u"Video")
             ))
         except ImportError:
             pass
@@ -358,7 +358,7 @@ def allowed_nested_blocks(self):
             pass
 
         try:
-            from ooyala_player import OoyalaPlayerBlock
+            from ooyala_player.ooyala_player import OoyalaPlayerBlock
             additional_blocks.append(NestedXBlockSpec(
                 OoyalaPlayerBlock, category='ooyala-player', label=_(u"Ooyala Player")
             ))

problem_builder/step.py

@@ -136,9 +136,9 @@ def allowed_nested_blocks(self):
         """
         additional_blocks = []
         try:
-            from xmodule.video_module.video_module import VideoDescriptor
+            from xmodule.video_module.video_module import VideoBlock
             additional_blocks.append(NestedXBlockSpec(
-                VideoDescriptor, category='video', label=_(u"Video")
+                VideoBlock, category='video', label=_(u"Video")
             ))
         except ImportError:
             pass
@@ -151,7 +151,7 @@ def allowed_nested_blocks(self):
             pass
 
         try:
-            from ooyala_player import OoyalaPlayerBlock
+            from ooyala_player.ooyala_player import OoyalaPlayerBlock
             additional_blocks.append(NestedXBlockSpec(
                 OoyalaPlayerBlock, category='ooyala-player', label=_(u"Ooyala Player")
             ))

problem_builder/tests/unit/utils.py

@@ -68,7 +68,7 @@ def assert_allowed_nested_blocks(self, block, message_blocks=[]):
             'xmodule.video_module': xmodule_mock.video_module,
             'xmodule.video_module.video_module': xmodule_mock.video_module.video_module,
             'imagemodal': Mock(),
-            'ooyala_player': Mock(),
+            'ooyala_player.ooyala_player': Mock(),
         }
         with patch.dict(modules, fake_modules):
             self.assertEqual(

setup.py

@@ -28,7 +28,7 @@
 
 # Constants #########################################################
 
-VERSION = '4.1.7'
+VERSION = '4.1.8'
 
 # Functions #########################################################