Changeset 1669

Timestamp:

09/13/08 22:15:23 (3 months ago)

Author:

nick

Message:

Merged: source:pyamf/branches/adapter-helper-350

Fixes: #350
Author: nick
Reviewer: thijs

Location:

pyamf/trunk

Files:

• . (modified) (1 prop)
• pyamf/adapters/__init__.py (modified) (1 diff)
• pyamf/amf0.py (modified) (1 diff)
• pyamf/amf3.py (modified) (1 diff)
• pyamf/tests/test_adapters.py (modified) (2 diffs)

pyamf/trunk

@@ +1 @@
+/pyamf/branches/adapter-helper-350:1638-1668
 /pyamf/branches/class-def-ref-341:1594-1597
 /pyamf/branches/class-init-args-322:1527-1528,1530-1532

@@ +1 @@
+/pyamf/branches/adapter-helper-350:1638-1668
 /pyamf/branches/class-def-ref-341:1594-1597
 /pyamf/branches/class-init-args-322:1527-1528,1530-1532

pyamf/trunk/pyamf/adapters/__init__.py

@@ -49 +49 @@
 
     adapters_registered = True
+
+def register_adapter(mod, func):
+    """
+    Registers a callable to be executed when a module is imported. If the
+    module already exists then the callable will be executed immediately.
+    You can register the same module multiple times, the callables will be
+    executed in the order they were registered. The root module must exist
+    (i.e. be importable) otherwise an C{ImportError} will be thrown
+
+    @param mod: The fully qualified module string, as used in the imports
+        statement. E.g. 'foo.bar.baz'. The string must map to a module
+        otherwise the callable will not fire.
+    @type mod: L{string}
+    @param func: The function to call when C{mod} is imported. This function
+        must take one arg, the newly imported C{module} object.
+    @param callable.
+    """
+    if not callable(func):
+        raise TypeError('func must be callable')
+
+    imports.whenImported(str(mod), func)

pyamf/trunk/pyamf/amf0.py

@@ -543 +543 @@
                 raise
             except:
-                raise pyamf.EncodeError("Unable to encode '%r'" % (data,))
+                #raise pyamf.EncodeError("Unable to encode '%r'" % (data,))
+                raise
 
     def writeNull(self, n):

pyamf/trunk/pyamf/amf3.py

@@ -1252 +1252 @@
                 raise
             except:
+                raise
                 raise pyamf.EncodeError("Unable to encode '%r'" % (data,))
 

pyamf/trunk/pyamf/tests/test_adapters.py

@@ -8 +8 @@
 """
 
-import unittest
+import unittest, os, sys
+
+from pyamf import adapters
+from pyamf.tests import util
+from pyamf.tests.test_imports import PostLoadHookClearingTestCase
+
+class AdapterHelperTestCase(PostLoadHookClearingTestCase):
+    def setUp(self):
+        PostLoadHookClearingTestCase.setUp(self)
+
+        self.old_env = os.environ.copy()
+        self.mods = sys.modules.copy()
+
+        self.path = os.path.join(os.path.dirname(__file__), 'imports')
+        sys.path.append(self.path)
+
+    def tearDown(self):
+        PostLoadHookClearingTestCase.tearDown(self)
+
+        util.replace_dict(os.environ, self.old_env)
+        util.replace_dict(sys.modules, self.mods)
+        sys.path.remove(self.path)
+
+    def test_basic(self):
+        class Foo(object):
+            def __call__(self, *args, **kwargs):
+                pass
+
+        def bar(*args, **kargs):
+            pass
+
+        self.assertRaises(TypeError, adapters.register_adapter, 'foo', 1)
+        self.assertRaises(TypeError, adapters.register_adapter, 'foo', 'asdf')
+        adapters.register_adapter('foo', Foo())
+        adapters.register_adapter('foo', bar)
+        adapters.register_adapter('foo', lambda x: x)
+
+    def test_import(self):
+        self.imported = False
+
+        def x(mod):
+            self.imported = True
+            self.foo = mod
+
+        adapters.register_adapter('foo', x)
+
+        import foo
+
+        self.assertTrue(self.imported)
+        self.assertEquals(self.foo, foo)
+
+    def test_root_import_fail(self):
+        self.assertRaises(ImportError, adapters.register_adapter, '__xyz', lambda x: x)
 
 def suite():
@@ -15 +67 @@
 
     suite = unittest.TestSuite()
+
+    suite.addTest(unittest.makeSuite(AdapterHelperTestCase))
 
     for testcase in glob(os.path.join(os.path.dirname(__file__), 'adapters', 'test_*.py')):

@@ +1 @@
+/pyamf/branches/adapter-helper-350:1638-1668
 /pyamf/branches/class-def-ref-341:1594-1597
 /pyamf/branches/class-init-args-322:1527-1528,1530-1532