fixed pydoc bug in [ticket:564]

1 files changed, 8 insertions, 1 deletions

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index ff92f0b43..0cc7d11ed 100644
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -732,7 +732,14 @@ class _FunctionGenerator(object):
         self.opts = opts
 
     def __getattr__(self, name):
-        if name[-1] == '_':
+        # passthru __ attributes; fixes pydoc
+        if name.startswith('__'):
+            try:
+                return self.__dict__[name]
+            except KeyError:
+                raise AttributeError(name)
+                
+        elif name.startswith('_'):
             name = name[0:-1]
         f = _FunctionGenerator(**self.opts)
         f.__names = list(self.__names) + [name]