From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 25 Apr 2007 01:04:52 +0000 (+0000)
Subject: wrap __name__ settings in a try/except for 2.3 compat
X-Git-Tag: rel_0_3_7~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e449800aff0d324b0b23add0415839e81fac5a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

wrap __name__ settings in a try/except for 2.3 compat
---

diff --git a/lib/sqlalchemy/ext/assignmapper.py b/lib/sqlalchemy/ext/assignmapper.py
index 8e06c5fb06..b7d5411b65 100644
--- a/lib/sqlalchemy/ext/assignmapper.py
+++ b/lib/sqlalchemy/ext/assignmapper.py
@@ -5,7 +5,10 @@ def monkeypatch_query_method(ctx, class_, name):
     def do(self, *args, **kwargs):
         query = Query(class_, session=ctx.current)
         return getattr(query, name)(*args, **kwargs)
-    do.__name__ = name
+    try:
+        do.__name__ = name
+    except:
+        pass
     setattr(class_, name, classmethod(do))
 
 def monkeypatch_objectstore_method(ctx, class_, name):
@@ -15,7 +18,10 @@ def monkeypatch_objectstore_method(ctx, class_, name):
             # flush expects a list of objects
             self = [self]
         return getattr(session, name)(self, *args, **kwargs)
-    do.__name__ = name
+    try:
+        do.__name__ = name
+    except:
+        pass
     setattr(class_, name, do)
     
 def assign_mapper(ctx, class_, *args, **kwargs):