From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 20 Jan 2011 20:36:40 +0000 (-0500)
Subject: and try that again.....
X-Git-Tag: rel_0_7b1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee174e5acfe713d8b2394cad32ef672bd605b1f0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

and try that again.....
---

diff --git a/lib/sqlalchemy/ext/hybrid.py b/lib/sqlalchemy/ext/hybrid.py
index 4cf33ffa8b..136d7d506e 100644
--- a/lib/sqlalchemy/ext/hybrid.py
+++ b/lib/sqlalchemy/ext/hybrid.py
@@ -289,7 +289,6 @@ SQL function to both sides::
 """
 from sqlalchemy import util
 from sqlalchemy.orm import attributes, interfaces
-types = __import__('types')
 
 class hybrid_method(object):
     """A decorator which allows definition of a Python object method with both
@@ -320,9 +319,9 @@ class hybrid_method(object):
 
     def __get__(self, instance, owner):
         if instance is None:
-            return types.MethodType(self.expr, owner, owner.__class__)
+            return self.expr.__get__(owner, owner.__class__)
         else:
-            return types.MethodType(self.func, instance, owner)
+            return self.func.__get__(instance, owner)
 
     def expression(self, expr):
         """Provide a modifying decorator that defines a SQL-expression producing method."""