Support xml blocks w/ multiple parents

2014-08-06 11:27:14 -04:00
parent e900a47b3f
commit 7a75b94ff7
1 changed files with 6 additions and 1 deletions
--- a/common/lib/xmodule/xmodule/modulestore/xml_importer.py
+++ b/common/lib/xmodule/xmodule/modulestore/xml_importer.py
@@ -233,7 +233,12 @@ def import_from_xml(
                    """
                    if subtree.has_children:
                        for child in subtree.get_children():
-                            all_locs.remove(child.location)
+                            try:
+                                all_locs.remove(child.location)
+                            except KeyError:
+                                # ContentStoreTest.test_image_import has non-tree children
+                                # so, make this more robust
+                                pass
                            if verbose:
                                log.debug('importing module location {loc}'.format(loc=child.location))