mass has_key->__contains__ migration, [ticket:738]

3 files changed, 7 insertions, 7 deletions

diff --git a/lib/sqlalchemy/databases/mssql.py b/lib/sqlalchemy/databases/mssql.py
index 308a38a76..97343d6c8 100644
--- a/lib/sqlalchemy/databases/mssql.py
+++ b/lib/sqlalchemy/databases/mssql.py
@@ -425,13 +425,13 @@ class MSSQLDialect(ansisql.ANSIDialect):
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
         opts.update(url.query)
-        if opts.has_key('auto_identity_insert'):
+        if 'auto_identity_insert' in opts:
             self.auto_identity_insert = bool(int(opts.pop('auto_identity_insert')))
-        if opts.has_key('query_timeout'):
+        if 'query_timeout' in opts:
             self.query_timeout = int(opts.pop('query_timeout'))
-        if opts.has_key('text_as_varchar'):
+        if 'text_as_varchar' in opts:
             self.text_as_varchar = bool(int(opts.pop('text_as_varchar')))
-        if opts.has_key('use_scope_identity'):
+        if 'use_scope_identity' in opts:
             self.use_scope_identity = bool(int(opts.pop('use_scope_identity')))
         return self.make_connect_string(opts)
 
@@ -870,7 +870,7 @@ class MSSQLCompiler(ansisql.ANSICompiler):
             
     def _schema_aliased_table(self, table):
         if getattr(table, 'schema', None) is not None:
-            if not self.tablealiases.has_key(table):
+            if table not in self.tablealiases:
                 self.tablealiases[table] = table.alias()
             return self.tablealiases[table]
         else:
diff --git a/lib/sqlalchemy/databases/oracle.py b/lib/sqlalchemy/databases/oracle.py
index 520332d45..a35db1982 100644
--- a/lib/sqlalchemy/databases/oracle.py
+++ b/lib/sqlalchemy/databases/oracle.py
@@ -638,7 +638,7 @@ class OracleCompiler(ansisql.ANSICompiler):
          """
 
         for c in insert.table.primary_key:
-            if not self.parameters.has_key(c.key):
+            if c.key not in self.parameters:
                 self.parameters[c.key] = None
         return ansisql.ANSICompiler.visit_insert(self, insert)
 
diff --git a/lib/sqlalchemy/databases/postgres.py b/lib/sqlalchemy/databases/postgres.py
index e4897bba6..74a3ef13f 100644
--- a/lib/sqlalchemy/databases/postgres.py
+++ b/lib/sqlalchemy/databases/postgres.py
@@ -234,7 +234,7 @@ class PGDialect(ansisql.ANSIDialect):
     
     def create_connect_args(self, url):
         opts = url.translate_connect_args(['host', 'database', 'user', 'password', 'port'])
-        if opts.has_key('port'):
+        if 'port' in opts:
             opts['port'] = int(opts['port'])
         opts.update(url.query)
         return ([], opts)