Fix static analysis of scoped_session

1 files changed, 4 insertions, 9 deletions

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index b3f2fa5db..116865281 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -70,6 +70,10 @@ class scoped_session(object):
         else:
             return self.registry()
 
+    def __getattr__(self, attr):
+        if attr in Session.public_methods:
+            return getattr(self.registry(), attr)
+
     def remove(self):
         """Dispose of the current :class:`.Session`, if present.
 
@@ -145,15 +149,6 @@ ScopedSession = scoped_session
 """Old name for backwards compatibility."""
 
 
-def instrument(name):
-    def do(self, *args, **kwargs):
-        return getattr(self.registry(), name)(*args, **kwargs)
-    return do
-
-for meth in Session.public_methods:
-    setattr(scoped_session, meth, instrument(meth))
-
-
 def makeprop(name):
     def set(self, attr):
         setattr(self.registry(), name, attr)