[Checkins] SVN: z3c.dobbin/trunk/ Catch patch exception; patch is no longer needed with SQLAlchemy 0.5rc1.

Malthe Borch mborch at gmail.com
Fri Sep 19 10:57:24 EDT 2008


Log message for revision 91274:
  Catch patch exception; patch is no longer needed with SQLAlchemy 0.5rc1.

Changed:
  U   z3c.dobbin/trunk/CHANGES.txt
  U   z3c.dobbin/trunk/src/z3c/dobbin/__init__.py

-=-
Modified: z3c.dobbin/trunk/CHANGES.txt
===================================================================
--- z3c.dobbin/trunk/CHANGES.txt	2008-09-19 14:56:12 UTC (rev 91273)
+++ z3c.dobbin/trunk/CHANGES.txt	2008-09-19 14:57:23 UTC (rev 91274)
@@ -4,6 +4,11 @@
 0.4dev
 ------
 
+0.4.2
+-----
+
+- Compatibility with SQLAlchemy 0.5rc1.
+
 0.4.1
 -----
 

Modified: z3c.dobbin/trunk/src/z3c/dobbin/__init__.py
===================================================================
--- z3c.dobbin/trunk/src/z3c/dobbin/__init__.py	2008-09-19 14:56:12 UTC (rev 91273)
+++ z3c.dobbin/trunk/src/z3c/dobbin/__init__.py	2008-09-19 14:57:23 UTC (rev 91274)
@@ -1,16 +1,19 @@
 from sqlalchemy import util
-from monkey import wrap
+from monkey import wrap, PatchException
 
 import types
 
 # patch sqlalchemy.util.class_hierarchy to filter out old-style classes
 # reference:
 # http://groups.google.com/group/sqlalchemy/browse_thread/thread/97f81966830da19b#
- at wrap(util.class_hierarchy,
-      '02daa72fd6238e668a27fa11781b7b372548e910',
-      '99edc891c7fab3b2e1c7838e3e51f4b146e81e46')
-def filtered_class_hierarchy(func, cls):
-    hier = func(cls)
-    return [cls for cls in hier if not isinstance(cls, types.ClassType)]
+try:
+    @wrap(util.class_hierarchy,
+          '02daa72fd6238e668a27fa11781b7b372548e910',
+          '99edc891c7fab3b2e1c7838e3e51f4b146e81e46')
+    def filtered_class_hierarchy(func, cls):
+        hier = func(cls)
+        return [cls for cls in hier if not isinstance(cls, types.ClassType)]
 
-util.class_hierarchy = filtered_class_hierarchy
+    util.class_hierarchy = filtered_class_hierarch
+except PatchException:
+    pass



More information about the Checkins mailing list