make ProxyImpl a top-level class (this makes it importable by FormAlchemy, making...

diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py
index fa5fb69a3cd9d77c7336e0a1ca0ebecfaa8a4126..49a49e36e9aece7ce165841325db717080bd7919 100644 (file)
--- a/lib/sqlalchemy/orm/attributes.py
+++ b/lib/sqlalchemy/orm/attributes.py
@@ -123,6 +123,12 @@ class InstrumentedAttribute(QueryableAttribute):
             return self
         return self.impl.get(instance_state(instance))
 
+class _ProxyImpl(object):
+    accepts_scalar_loader = False
+
+    def __init__(self, key):
+        self.key = key
+
 def proxied_attribute_factory(descriptor):
     """Create an InstrumentedAttribute / user descriptor hybrid.
 
@@ -130,12 +136,6 @@ def proxied_attribute_factory(descriptor):
     behavior and getattr() to the given descriptor.
     """
 
-    class ProxyImpl(object):
-        accepts_scalar_loader = False
-
-        def __init__(self, key):
-            self.key = key
-
     class Proxy(InstrumentedAttribute):
         """A combination of InsturmentedAttribute and a regular descriptor."""
 
@@ -145,7 +145,7 @@ def proxied_attribute_factory(descriptor):
             self.descriptor = self.user_prop = descriptor
             self._comparator = comparator
             self._parententity = parententity
-            self.impl = ProxyImpl(key)
+            self.impl = _ProxyImpl(key)
 
         def comparator(self):
             if callable(self._comparator):