Merge branch 'master' into ticket_1068

1 files changed, 18 insertions, 18 deletions

diff --git a/lib/sqlalchemy/dialects/sybase/base.py b/lib/sqlalchemy/dialects/sybase/base.py
index a9e5c5fda..6770ed8e7 100644
--- a/lib/sqlalchemy/dialects/sybase/base.py
+++ b/lib/sqlalchemy/dialects/sybase/base.py
@@ -475,12 +475,12 @@ class SybaseDialect(default.DefaultDialect):
               AND o.type in ('U', 'V')
         """)
 
-        # Py2K
-        if isinstance(schema, unicode):
-            schema = schema.encode("ascii")
-        if isinstance(table_name, unicode):
-            table_name = table_name.encode("ascii")
-        # end Py2K
+# start Py2K
+#        if isinstance(schema, unicode):
+#            schema = schema.encode("ascii")
+#        if isinstance(table_name, unicode):
+#            table_name = table_name.encode("ascii")
+# end Py2K
         result = connection.execute(TABLEID_SQL,
                                     schema_name=schema,
                                     table_name=table_name)
@@ -759,10 +759,10 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'U'
         """)
 
-        # Py2K
-        if isinstance(schema, unicode):
-            schema = schema.encode("ascii")
-        # end Py2K
+# start Py2K
+#        if isinstance(schema, unicode):
+#            schema = schema.encode("ascii")
+# end Py2K
         tables = connection.execute(TABLE_SQL, schema_name=schema)
 
         return [t["name"] for t in tables]
@@ -779,10 +779,10 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'V'
         """)
 
-        # Py2K
-        if isinstance(view_name, unicode):
-            view_name = view_name.encode("ascii")
-        # end Py2K
+# start Py2K
+#        if isinstance(view_name, unicode):
+#            view_name = view_name.encode("ascii")
+# end Py2K
         view = connection.execute(VIEW_DEF_SQL, view_name=view_name)
 
         return view.scalar()
@@ -799,10 +799,10 @@ class SybaseDialect(default.DefaultDialect):
             AND o.type = 'V'
         """)
 
-        # Py2K
-        if isinstance(schema, unicode):
-            schema = schema.encode("ascii")
-        # end Py2K
+# start Py2K
+#        if isinstance(schema, unicode):
+#            schema = schema.encode("ascii")
+# end Py2K
         views = connection.execute(VIEW_SQL, schema_name=schema)
 
         return [v["name"] for v in views]