Changeset 1201

Timestamp:

04/14/08 19:57:56 (2 years ago)

Author:

nick

Message:

Merged source:pyamf/branches/adapter-sub-module-246. Fixes #246

Location:

pyamf/trunk/pyamf/adapters

Files:

• __init__.py (modified) (1 diff)
• _django.py (copied) (copied from pyamf/branches/adapter-sub-module-246/pyamf/adapters/_django.py)

pyamf/trunk/pyamf/adapters/__init__.py

@@ -42 +42 @@
         mod = os.path.basename(f).split(os.path.extsep, 1)[0]
 
-        if not mod.startswith('_') or mod == '__init__':
+        if mod == '__init__':
             continue
 
-        try:
-            imports.find_module(mod[1:])
-        except ImportError:
-            continue
-
-        module = imports.whenImported(mod[1:], PackageImporter(mod))
+        module = imports.whenImported(mod[1:].replace('_', '.'), PackageImporter(mod))
 
     adapters_registered = True