From 0edc40de34f37c3322e440656e71d7dbe77c202a Mon Sep 17 00:00:00 2001
From: Victor Shnayder <victor@mitx.mit.edu>
Date: Tue, 31 Jul 2012 11:25:10 -0400
Subject: [PATCH] Address minor comments in #313

---
 common/lib/xmodule/xmodule/modulestore/mongo.py    |  2 +-
 common/lib/xmodule/xmodule/x_module.py             |  3 ---
 .../courseware/management/commands/clean_xml.py    |  3 ---
 lms/djangoapps/courseware/tests/tests.py           | 14 ++++++++------
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/common/lib/xmodule/xmodule/modulestore/mongo.py b/common/lib/xmodule/xmodule/modulestore/mongo.py
index 061e2aafe9..6a0bdad06a 100644
--- a/common/lib/xmodule/xmodule/modulestore/mongo.py
+++ b/common/lib/xmodule/xmodule/modulestore/mongo.py
@@ -293,7 +293,7 @@ class MongoModuleStore(ModuleStore):
         # Check that it's actually in this modulestore.
         item = self._find_one(location)
         # now get the parents
-        items = self.collection.find({'definition.children': str(location)},
+        items = self.collection.find({'definition.children': location.url()},
                                     {'_id': True})
         return [i['_id'] for i in items]
 
diff --git a/common/lib/xmodule/xmodule/x_module.py b/common/lib/xmodule/xmodule/x_module.py
index 8803c37d78..c4ba3e1e58 100644
--- a/common/lib/xmodule/xmodule/x_module.py
+++ b/common/lib/xmodule/xmodule/x_module.py
@@ -194,9 +194,6 @@ class XModule(HTMLSnippet):
         self.metadata = kwargs.get('metadata', {})
         self._loaded_children = None
 
-    def get_name(self):
-        return self.name
-
     def get_children(self):
         '''
         Return module instances for all the children of this module.
diff --git a/lms/djangoapps/courseware/management/commands/clean_xml.py b/lms/djangoapps/courseware/management/commands/clean_xml.py
index 41f0c39cde..05865bb289 100644
--- a/lms/djangoapps/courseware/management/commands/clean_xml.py
+++ b/lms/djangoapps/courseware/management/commands/clean_xml.py
@@ -17,9 +17,6 @@ def traverse_tree(course):
     queue = [course]
     while len(queue) > 0:
         node = queue.pop()
-#        print '{0}:'.format(node.location)
-#        if 'data' in node.definition:
-#            print '{0}'.format(node.definition['data'])
         queue.extend(node.get_children())
 
     return True
diff --git a/lms/djangoapps/courseware/tests/tests.py b/lms/djangoapps/courseware/tests/tests.py
index 8e9d13f8d5..0e2f7d7aa5 100644
--- a/lms/djangoapps/courseware/tests/tests.py
+++ b/lms/djangoapps/courseware/tests/tests.py
@@ -1,19 +1,20 @@
 import copy
 import json
+from path import path
 import os
 
 from pprint import pprint
+from nose import SkipTest
 
 from django.test import TestCase
 from django.test.client import Client
-from mock import patch, Mock
-from override_settings import override_settings
 from django.conf import settings
 from django.core.urlresolvers import reverse
-from path import path
+from mock import patch, Mock
+from override_settings import override_settings
 
-from student.models import Registration
 from django.contrib.auth.models import User
+from student.models import Registration
 
 from xmodule.modulestore.django import modulestore
 import xmodule.modulestore.django
@@ -189,11 +190,12 @@ class RealCoursesLoadTestCase(PageLoader):
         xmodule.modulestore.django._MODULESTORES = {}
         xmodule.modulestore.django.modulestore().collection.drop()
 
-    # TODO: Disabled test for now..  Fix once things are cleaned up.
-    def Xtest_real_courses_loads(self):
+    def test_real_courses_loads(self):
         '''See if any real courses are available at the REAL_DATA_DIR.
         If they are, check them.'''
 
+        # TODO: Disabled test for now..  Fix once things are cleaned up.
+        raise SkipTest
         # TODO: adjust staticfiles_dirs
         if not os.path.isdir(REAL_DATA_DIR):
             # No data present.  Just pass.