make use of the isinstance(obj, (A,B)) idiom, makes the code a bit shorter and more...

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 341550e114d8893d4cf3227b761883375cf2311d..27d87847e2e7d8c17565575129c90692d5e6bf16 100644 (file)
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1189,7 +1189,7 @@ class MySQLDialect(ansisql.ANSIDialect):
 class MySQLCompiler(ansisql.ANSICompiler):
     def visit_cast(self, cast):
         """hey ho MySQL supports almost no types at all for CAST"""
-        if (isinstance(cast.type, sqltypes.Date) or isinstance(cast.type, sqltypes.Time) or isinstance(cast.type, sqltypes.DateTime)):
+        if isinstance(cast.type, (sqltypes.Date, sqltypes.Time, sqltypes.DateTime)):
             return super(MySQLCompiler, self).visit_cast(cast)
         else:
             # so just skip the CAST altogether for now.

diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index c0264ca84682b9aa04fd2ea8f9f199ddfb689138..39ad51e26595a89651fc3211dd7d3c092030c68e 100644 (file)
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -228,7 +228,7 @@ class OracleDialect(ansisql.ANSIDialect):
         return 30
         
     def oid_column_name(self, column):
-        if not isinstance(column.table, sql.TableClause) and not isinstance(column.table, sql.Select):
+        if not isinstance(column.table, (sql.TableClause, sql.Select)):
             return None
         else:
             return "rowid"

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 467aed55df327623f103a85676d2fbc1310eedcb..6c08ead7a085cb6b748dc95beda71b8676f2d7e5 100644 (file)
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -598,7 +598,7 @@ class Connection(Connectable):
     def execute_text(self, statement, *multiparams, **params):
         if len(multiparams) == 0:
             parameters = params or None
-        elif len(multiparams) == 1 and (isinstance(multiparams[0], list) or isinstance(multiparams[0], tuple) or isinstance(multiparams[0], dict)):
+        elif len(multiparams) == 1 and isinstance(multiparams[0], (list, tuple, dict)):
             parameters = multiparams[0]
         else:
             parameters = list(multiparams)
@@ -612,7 +612,7 @@ class Connection(Connectable):
         elif len(multiparams) == 1:
             if multiparams[0] == None:
                 return [{}]
-            elif isinstance (multiparams[0], list) or isinstance (multiparams[0], tuple):
+            elif isinstance (multiparams[0], (list, tuple)):
                 return multiparams[0]
             else:
                 return [multiparams[0]]
@@ -649,7 +649,7 @@ class Connection(Connectable):
     def _execute_raw(self, context):
         self.__engine.logger.info(context.statement)
         self.__engine.logger.info(repr(context.parameters))
-        if context.parameters is not None and isinstance(context.parameters, list) and len(context.parameters) > 0 and (isinstance(context.parameters[0], list) or isinstance(context.parameters[0], tuple) or isinstance(context.parameters[0], dict)):
+        if context.parameters is not None and isinstance(context.parameters, list) and len(context.parameters) > 0 and isinstance(context.parameters[0], (list, tuple, dict)):
             self._executemany(context)
         else:
             self._execute(context)

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 3b58e48462e8b13e3aa270330ab96a95fdeb0f7f..58827a7b86628b941334123edea627d6cbf601b4 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -640,7 +640,7 @@ class Query(object):
                                 appender.append(None)
                         process.append((proc, appender))
                     x(m)
-                elif isinstance(m, sql.ColumnElement) or isinstance(m, basestring):
+                elif isinstance(m, (sql.ColumnElement, basestring)):
                     def y(m):
                         res = []
                         def proc(context, row):

diff --git a/lib/sqlalchemy/schema.py b/lib/sqlalchemy/schema.py
index 3df300d8dbd5601b6af9b22e5e55d0c047300e52..bd94ea3940dca773e16235051593f604c24e33c6 100644 (file)
--- a/lib/sqlalchemy/schema.py
+++ b/lib/sqlalchemy/schema.py
@@ -1094,7 +1094,7 @@ class MetaData(SchemaItem):
         """
         
         from sqlalchemy.engine.url import URL
-        if isinstance(engine_or_url, basestring) or isinstance(engine_or_url, URL):
+        if isinstance(engine_or_url, (basestring, URL)):
             self._engine = sqlalchemy.create_engine(engine_or_url, **kwargs)
         else:
             self._engine = engine_or_url
@@ -1185,7 +1185,7 @@ thread-local basis.
 
     def connect(self, engine_or_url, **kwargs):
         from sqlalchemy.engine.url import URL
-        if isinstance(engine_or_url, basestring) or isinstance(engine_or_url, URL):
+        if isinstance(engine_or_url, (basestring, URL)):
             try:
                 self.context._engine = self.__engines[engine_or_url]
             except KeyError:

diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py
index 0abb28a7e12142963f2ed60569847be66d56b901..ebc504db62dab790fa61d73ab63fa9ef59249568 100644 (file)
--- a/lib/sqlalchemy/sql.py
+++ b/lib/sqlalchemy/sql.py
@@ -1096,7 +1096,7 @@ class ClauseElement(object):
         ``SET`` and ``VALUES`` clause of those statements.
         """
 
-        if (isinstance(parameters, list) or isinstance(parameters, tuple)):
+        if isinstance(parameters, (list, tuple)):
             parameters = parameters[0]
 
         if compiler is None:
@@ -3046,7 +3046,7 @@ class _UpdateBase(ClauseElement):
         if parameters is None:
             return None
 
-        if isinstance(parameters, list) or isinstance(parameters, tuple):
+        if isinstance(parameters, (list, tuple)):
             pp = {}
             i = 0
             for c in self.table.c:

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 47e729d7def42c2872e9f5127478c9cf34a6d11c..028baf8aaa7e46e77dc0180a877c02597e7d8376 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -59,7 +59,7 @@ else:
 def to_list(x, default=None):
     if x is None:
         return default
-    if not isinstance(x, list) and not isinstance(x, tuple):
+    if not isinstance(x, (list, tuple)):
         return [x]
     else:
         return x