respond to comments on merge

common/lib/xmodule/xmodule/x_module.py

@@ -404,19 +404,16 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
                     if k not in self._inherited_metadata)
 
     @staticmethod
-    def compute_inherited_metadata(course):
-        """Given a course descriptor, traverse the entire course tree and do
-        metadata inheritance.  Should be called after importing a course.
+    def compute_inherited_metadata(node):
+        """Given a descriptor, traverse all of its descendants and do metadata
+        inheritance.  Should be called on a CourseDescriptor after importing a
+        course.
 
         NOTE: This means that there is no such thing as lazy loading at the
         moment--this accesses all the children."""
-        def do_inherit(node):
-            for c in node.get_children():
-                c.inherit_metadata(node.metadata)
-                do_inherit(c)
-
-        do_inherit(course)
-
+        for c in node.get_children():
+            c.inherit_metadata(node.metadata)
+            XModuleDescriptor.compute_inherited_metadata(c)
 
     def inherit_metadata(self, metadata):
         """
@@ -430,7 +427,6 @@ class XModuleDescriptor(Plugin, HTMLSnippet):
             if attr not in self.metadata and attr in metadata:
                 self._inherited_metadata.add(attr)
                 self.metadata[attr] = metadata[attr]
-        print "final self.metadata: {}".format(self.metadata)
 
     def get_children(self):
         """Returns a list of XModuleDescriptor instances for the children of