Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move entry_point down into XModule/XModuleDescriptor so that 'xmodule.v1' only applies to XModules, not pure XBlocks with the XModuleMixin

Browse Source
This commit is contained in:
Calen Pennington
2015-04-28 15:33:04 -04:00
parent d7d60bc563
commit a1c0773c4d
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/lib/xmodule/xmodule/x_module.py
View File

@@ -269,9 +269,6 @@ class XModuleMixin(XModuleFields, XBlockMixin):
Adding this Mixin to an :class:`XBlock` allows it to cooperate with old-style :class:`XModules` Adding this Mixin to an :class:`XBlock` allows it to cooperate with old-style :class:`XModules`
""" """
entry_point = "xmodule.v1"
# Attributes for inspection of the descriptor # Attributes for inspection of the descriptor
# This indicates whether the xmodule is a problem-type. # This indicates whether the xmodule is a problem-type.
@@ -728,6 +725,8 @@ class XModule(XModuleMixin, HTMLSnippet, XBlock): # pylint: disable=abstract-me
See the HTML module for a simple example. See the HTML module for a simple example.
""" """
entry_point = "xmodule.v1"
has_score = descriptor_attr('has_score') has_score = descriptor_attr('has_score')
_field_data_cache = descriptor_attr('_field_data_cache') _field_data_cache = descriptor_attr('_field_data_cache')
_field_data = descriptor_attr('_field_data') _field_data = descriptor_attr('_field_data')
@@ -923,6 +922,9 @@ class XModuleDescriptor(XModuleMixin, HTMLSnippet, ResourceTemplates, XBlock):
create a problem, and can generate XModules (which do know about student create a problem, and can generate XModules (which do know about student
state). state).
""" """
entry_point = "xmodule.v1"
module_class = XModule module_class = XModule
# VS[compat]. Backwards compatibility code that can go away after # VS[compat]. Backwards compatibility code that can go away after