From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 31 Mar 2006 07:36:51 +0000 (+0000)
Subject: adjustments...
X-Git-Tag: rel_0_1_6~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d47cc9129d909a0930cdf4fedb1bcf06b2c876fa;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

adjustments...
---

diff --git a/lib/sqlalchemy/mapping/mapper.py b/lib/sqlalchemy/mapping/mapper.py
index 0f2b4e19f7..a9f7df63c6 100644
--- a/lib/sqlalchemy/mapping/mapper.py
+++ b/lib/sqlalchemy/mapping/mapper.py
@@ -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
 
diff --git a/lib/sqlalchemy/mods/selectresults.py b/lib/sqlalchemy/mods/selectresults.py
index 1f6b77a25c..b4f16c41ce 100644
--- a/lib/sqlalchemy/mods/selectresults.py
+++ b/lib/sqlalchemy/mods/selectresults.py
@@ -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={}):