Commits

Anonymous committed b1487b9

Fixed issue #90, changing 66 failures to passes

Comments (0)

Files changed (2)

django/conf/project_template/manage.py

 #!/usr/bin/env python
 from django.core.management import execute_manager
 try:
-    import settings # Assumed to be in the same directory.
+    settings = __import__('settings', globals(), locals(), [], -1) # Assumed to be in the same directory.
 except ImportError:
     import sys
     sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)

django/utils/datastructures.py

             yield v
 
     def items(self):
-        return list(self.iteritems())
+        return list(getattr(self, items)()
 
     def keys(self):
-        return list(self.iterkeys())
+        return list(getattr(self, keys)()
 
     def values(self):
-        return list(self.itervalues())
+        return list(getattr(self, values)()
 
     def has_key(self, key):
         for dict_ in self.dicts: