Merge pull request #7871 from edx/shr/bug/TNL-2094-6.00.x-export-issue

update the attrib using dict-->update() function

cms/djangoapps/contentstore/views/tests/test_import_export.py

@@ -427,3 +427,20 @@ class ExportTestCase(CourseTestCase):
             self.assertEqual(video_xml.get('youtube_id_1_0'), youtube_id)
         finally:
             shutil.rmtree(root_dir / name)
+
+    def test_export_success_with_custom_tag(self):
+        """
+        Verify that course export with customtag
+        """
+        xml_string = '<impl>slides</impl>'
+        vertical = ItemFactory.create(
+            parent_location=self.course.location, category='vertical', display_name='foo'
+        )
+        ItemFactory.create(
+            parent_location=vertical.location,
+            category='customtag',
+            display_name='custom_tag_foo',
+            data=xml_string
+        )
+
+        self.test_export_targz_urlparam()

common/lib/xmodule/xmodule/xml_module.py

@@ -446,7 +446,7 @@ class XmlParserMixin(object):
             node.tag = xml_object.tag
             node.text = xml_object.text
             node.tail = xml_object.tail
-            node.attrib = xml_object.attrib
+            node.attrib.update(xml_object.attrib)
             node.extend(xml_object)
 
         node.set('url_name', self.url_name)