Changeset 1406

Timestamp:

05/20/08 15:05:20 (22 months ago)

Author:

nick

Message:

Adding in an adapter for django fields, to cover NOT_PROVIDED model defaults

Location:

pyamf/branches/django-fields-adapter

Files:

• . (copied) (copied from pyamf/trunk)
• pyamf/adapters/_django_db_models_fields.py (added)
• pyamf/tests/adapters/test_django.py (modified) (2 diffs)
• pyamf/tests/imports/foo/bar/gak.py (added)
• pyamf/tests/test_imports.py (modified) (1 diff)
• pyamf/util/imports.py (modified) (1 diff)

pyamf/branches/django-fields-adapter/pyamf/tests/adapters/test_django.py

@@ -12 +12 @@
 
 import pyamf
+from pyamf.tests import util
 
 class ModelsBaseTestCase(unittest.TestCase):
@@ -36 +37 @@
 
     def tearDown(self):
-        os.environ = self.old_env
-        sys.modules = self.mods
+        util.replace_dict(os.environ, self.old_env)
+        util.replace_dict(sys.modules, self.mods)
 
         if self.existing:

pyamf/branches/django-fields-adapter/pyamf/tests/test_imports.py

@@ -227 +227 @@
         self.assertEquals(self.executed, True)
 
+    def test_multipleChildDeepParent(self):
+        self._clearModules('foo', 'foo.bar', 'foo.bar.baz', 'foo.bar.gak')
+        self._mods = []
+
+        imports.whenImported('foo.bar.baz', lambda m: self._mods.append(m))
+        imports.whenImported('foo.bar.gak', lambda m: self._mods.append(m))
+
+        import foo.bar.baz
+        import foo.bar.gak
+
+        imports._loadModule(foo.bar.baz)
+        imports._loadModule(foo.bar.gak)
+
+        self.assertEquals(self._mods, [foo.bar.baz, foo.bar.gak])
+
 class FindModuleTestCase(unittest.TestCase):
     def setUp(self):

pyamf/branches/django-fields-adapter/pyamf/util/imports.py

@@ -281 +281 @@
         elif sub_hook not in postLoadHooks[moduleName[:splitpos]]:
             whenImported(moduleName[:splitpos], sub_hook)
+        else:
+            postLoadHooks[moduleName[:splitpos]].append(sub_hook)
     else:
         return _setModuleHook(moduleName, hook)