From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 23 Oct 2011 19:48:51 +0000 (-0400)
Subject: Backed out changeset 8ef278ec7557a5b3446807e9bc16624630ffd034
X-Git-Tag: rel_0_7_4~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=51748c7a485d91dc3ba63312ef7036bcf1e3a64e;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Backed out changeset 8ef278ec7557a5b3446807e9bc16624630ffd034
---

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 7ab008a107..3d00b31979 100644
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -322,30 +322,27 @@ class Table(SchemaItem, expression.TableClause):
         # we do it after the table is in the singleton dictionary to support
         # circular foreign keys
         if autoload:
-            self._autoload(metadata, autoload_with, include_columns)
+            if autoload_with:
+                autoload_with.run_callable(
+                    autoload_with.dialect.reflecttable,
+                    self, include_columns
+                )
+            else:
+                bind = _bind_or_error(metadata, 
+                        msg="No engine is bound to this Table's MetaData. "
+                        "Pass an engine to the Table via "
+                        "autoload_with=<someengine>, "
+                        "or associate the MetaData with an engine via "
+                        "metadata.bind=<someengine>")
+                bind.run_callable(
+                        bind.dialect.reflecttable,
+                        self, include_columns
+                    )
 
         # initialize all the column, etc. objects.  done after reflection to
         # allow user-overrides
         self._init_items(*args)
 
-    def _autoload(self, metadata, autoload_with, include_columns):
-        if autoload_with:
-            autoload_with.run_callable(
-                autoload_with.dialect.reflecttable,
-                self, include_columns
-            )
-        else:
-            bind = _bind_or_error(metadata, 
-                    msg="No engine is bound to this Table's MetaData. "
-                    "Pass an engine to the Table via "
-                    "autoload_with=<someengine>, "
-                    "or associate the MetaData with an engine via "
-                    "metadata.bind=<someengine>")
-            bind.run_callable(
-                    bind.dialect.reflecttable,
-                    self, include_columns
-                )
-
     @property
     def _sorted_constraints(self):
         """Return the set of constraints as a list, sorted by creation order."""
@@ -374,9 +371,6 @@ class Table(SchemaItem, expression.TableClause):
         if 'info' in kwargs:
             self.info = kwargs.pop('info')
 
-        if autoload:
-            self._autoload(self.metadata, autoload_with, include_columns)
-
         self._extra_kwargs(**kwargs)
         self._init_items(*args)
 
diff --git a/lib/sqlalchemy/types.py b/lib/sqlalchemy/types.py
index af98dd8139..e58313466a 100644
--- a/lib/sqlalchemy/types.py
+++ b/lib/sqlalchemy/types.py
@@ -1584,7 +1584,7 @@ class _Binary(TypeEngine):
 
     @property
     def python_type(self):
-        # Py3K
+        #Py3K
         #return bytes
         # Py2K
         return str