Added descriptor to xmodule init. Now xmodules have pointer to their descriptor.

common/lib/xmodule/xmodule/abtest_module.py

@@ -31,8 +31,8 @@ class ABTestModule(XModule):
     Implements an A/B test with an aribtrary number of competing groups
     """
 
-    def __init__(self, system, location, definition, instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, instance_state, shared_state, **kwargs)
+    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
 
         if shared_state is None:
 

common/lib/xmodule/xmodule/capa_module.py

@@ -80,9 +80,9 @@ class CapaModule(XModule):
     js_module_name = "Problem"
     css = {'scss': [resource_string(__name__, 'css/capa/display.scss')]}
 
-    def __init__(self, system, location, definition, instance_state=None,
+    def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, instance_state,
+        XModule.__init__(self, system, location, definition, descriptor, instance_state,
                          shared_state, **kwargs)
 
         self.attempts = 0

common/lib/xmodule/xmodule/html_module.py

@@ -17,9 +17,9 @@ class HtmlModule(XModule):
     def get_html(self):
         return self.html
 
-    def __init__(self, system, location, definition,
+    def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition,
+        XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
         self.html = self.definition['data']
 

common/lib/xmodule/xmodule/seq_module.py

@@ -25,9 +25,9 @@ class SequenceModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/sequence/display.scss')]}
     js_module_name = "Sequence"
 
-    def __init__(self, system, location, definition, instance_state=None,
+    def __init__(self, system, location, definition, descriptor, instance_state=None,
                  shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition,
+        XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
         self.position = 1
 

common/lib/xmodule/xmodule/template_module.py

@@ -26,9 +26,9 @@ class CustomTagModule(XModule):
         More information given in <a href="/book/234">the text</a>
     """
 
-    def __init__(self, system, location, definition,
+    def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition,
+        XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
 
         xmltree = etree.fromstring(self.definition['data'])

common/lib/xmodule/xmodule/vertical_module.py

@@ -10,8 +10,8 @@ class_priority = ['video', 'problem']
 class VerticalModule(XModule):
     ''' Layout module for laying out submodules vertically.'''
 
-    def __init__(self, system, location, definition, instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition, instance_state, shared_state, **kwargs)
+    def __init__(self, system, location, definition, descriptor, instance_state=None, shared_state=None, **kwargs):
+        XModule.__init__(self, system, location, definition, descriptor, instance_state, shared_state, **kwargs)
         self.contents = None
 
     def get_html(self):

common/lib/xmodule/xmodule/video_module.py

@@ -23,9 +23,9 @@ class VideoModule(XModule):
     css = {'scss': [resource_string(__name__, 'css/video/display.scss')]}
     js_module_name = "Video"
 
-    def __init__(self, system, location, definition,
+    def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
-        XModule.__init__(self, system, location, definition,
+        XModule.__init__(self, system, location, definition, descriptor,
                          instance_state, shared_state, **kwargs)
         xmltree = etree.fromstring(self.definition['data'])
         self.youtube = xmltree.get('youtube')

common/lib/xmodule/xmodule/x_module.py

@@ -142,7 +142,7 @@ class XModule(HTMLSnippet):
     # in the module
     icon_class = 'other'
 
-    def __init__(self, system, location, definition,
+    def __init__(self, system, location, definition, descriptor,
                  instance_state=None, shared_state=None, **kwargs):
         '''
         Construct a new xmodule
@@ -188,6 +188,7 @@ class XModule(HTMLSnippet):
         self.system = system
         self.location = Location(location)
         self.definition = definition
+        self.descriptor = descriptor
         self.instance_state = instance_state
         self.shared_state = shared_state
         self.id = self.location.url()
@@ -426,6 +427,7 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             system,
             self.location,
             self.definition,
+            self,
             metadata=self.metadata
         )