Merge branch 'release'

common/lib/xmodule/xmodule/imageannotation_module.py

@@ -19,7 +19,9 @@ _ = lambda text: text
 
 class AnnotatableFields(object):
     """ Fields for `ImageModule` and `ImageDescriptor`. """
-    data = String(help="XML data for the annotation", scope=Scope.content, default=textwrap.dedent("""\
+    data = String(help=_("XML data for the annotation"),
+        scope=Scope.content,
+        default=textwrap.dedent("""\
         <annotatable>
             <instructions>
                 <p>

common/lib/xmodule/xmodule/split_test_module.py

@@ -290,7 +290,7 @@ class SplitTestModule(SplitTestFields, XModule, StudioEditableModule):
         Record in the tracking logs which child was rendered
         """
         # TODO: use publish instead, when publish is wired to the tracking logs
-        self.system.track_function('xblock.split_test.child_render', {'child-id': self.child.scope_ids.usage_id})
+        self.system.track_function('xblock.split_test.child_render', {'child-id': self.child.scope_ids.usage_id.to_deprecated_string()})
         return Response()
 
     def get_icon_class(self):

common/lib/xmodule/xmodule/textannotation_module.py

@@ -17,7 +17,9 @@ _ = lambda text: text
 
 class AnnotatableFields(object):
     """Fields for `TextModule` and `TextDescriptor`."""
-    data = String(help=_("XML data for the annotation"), scope=Scope.content, default=textwrap.dedent("""\
+    data = String(help=_("XML data for the annotation"),
+        scope=Scope.content,
+        default=textwrap.dedent("""\
         <annotatable>
             <instructions>
                 <p>

common/lib/xmodule/xmodule/videoannotation_module.py

@@ -19,7 +19,9 @@ _ = lambda text: text
 
 class AnnotatableFields(object):
     """ Fields for `VideoModule` and `VideoDescriptor`. """
-    data = String(help=_("XML data for the annotation"), scope=Scope.content, default=textwrap.dedent("""\
+    data = String(help=_("XML data for the annotation"),
+        scope=Scope.content,
+        default=textwrap.dedent("""\
         <annotatable>
             <instructions>
                 <p>