]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
adjustments...
authorMike Bayer <mike_mp@zzzcomputing.com>
Fri, 31 Mar 2006 07:36:51 +0000 (07:36 +0000)
committerMike Bayer <mike_mp@zzzcomputing.com>
Fri, 31 Mar 2006 07:36:51 +0000 (07:36 +0000)
lib/sqlalchemy/mapping/mapper.py
lib/sqlalchemy/mods/selectresults.py

index 0f2b4e19f71c51f3b4f21eb575455d9e4f2a4ad4..a9f7df63c6f418a7629f8a849d852a449cd342d4 100644 (file)
@@ -58,9 +58,10 @@ class Mapper(object):
         
         for ext_class in global_extensions:
             ext = ext_class().chain(ext)
-        
-        for ext_obj in util.to_list(extension):
-            ext = ext_obj.chain(ext)
+
+        if extension is not None:
+            for ext_obj in util.to_list(extension):
+                ext = ext_obj.chain(ext)
             
         self.extension = ext
 
index 1f6b77a25cf4f2ed83d6f957f98fb706938bad76..b4f16c41ced0f4d09fe44e802c24382dd7d62353 100644 (file)
@@ -13,6 +13,8 @@ class SelectResultsExt(mapping.MapperExtension):
             return mapping.EXT_PASS
         else:
             return SelectResults(mapper, arg, ops=kwargs)
+
+MapperExtension = SelectResultsExt
         
 class SelectResults(object):
     def __init__(self, mapper, clause=None, ops={}):