- do an autopep8 pass for just about everything other

than line length

1 files changed, 181 insertions, 192 deletions

diff --git a/tests/test_autogen_indexes.py b/tests/test_autogen_indexes.py
index 2f7a4a1..0885477 100644
--- a/tests/test_autogen_indexes.py
+++ b/tests/test_autogen_indexes.py
@@ -14,6 +14,7 @@ py3k = sys.version_info >= (3, )
 
 from .test_autogenerate import AutogenFixtureTest
 
+
 class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
     reports_unique_constraints = True
 
@@ -22,17 +23,17 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m2 = MetaData()
 
         Table('user', m1,
-            Column('id', Integer, primary_key=True),
-            Column('name', String(50), nullable=False, index=True),
-            Column('a1', String(10), server_default="x")
-        )
+              Column('id', Integer, primary_key=True),
+              Column('name', String(50), nullable=False, index=True),
+              Column('a1', String(10), server_default="x")
+              )
 
         Table('user', m2,
-            Column('id', Integer, primary_key=True),
-            Column('name', String(50), nullable=False),
-            Column('a1', String(10), server_default="x"),
-            UniqueConstraint("name", name="uq_user_name")
-        )
+              Column('id', Integer, primary_key=True),
+              Column('name', String(50), nullable=False),
+              Column('a1', String(10), server_default="x"),
+              UniqueConstraint("name", name="uq_user_name")
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -46,21 +47,20 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
             eq_(diffs[0][0], "remove_index")
             eq_(diffs[0][1].name, "ix_user_name")
 
-
     def test_add_unique_constraint(self):
         m1 = MetaData()
         m2 = MetaData()
         Table('address', m1,
-            Column('id', Integer, primary_key=True),
-            Column('email_address', String(100), nullable=False),
-            Column('qpr', String(10), index=True),
-        )
+              Column('id', Integer, primary_key=True),
+              Column('email_address', String(100), nullable=False),
+              Column('qpr', String(10), index=True),
+              )
         Table('address', m2,
-            Column('id', Integer, primary_key=True),
-            Column('email_address', String(100), nullable=False),
-            Column('qpr', String(10), index=True),
-            UniqueConstraint("email_address", name="uq_email_address")
-        )
+              Column('id', Integer, primary_key=True),
+              Column('email_address', String(100), nullable=False),
+              Column('qpr', String(10), index=True),
+              UniqueConstraint("email_address", name="uq_email_address")
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -70,29 +70,28 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         else:
             eq_(diffs, [])
 
-
     def test_index_becomes_unique(self):
         m1 = MetaData()
         m2 = MetaData()
         Table('order', m1,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-            UniqueConstraint('order_id', 'user_id',
-                name='order_order_id_user_id_unique'
-            ),
-            Index('order_user_id_amount_idx', 'user_id', 'amount')
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              UniqueConstraint('order_id', 'user_id',
+                               name='order_order_id_user_id_unique'
+                               ),
+              Index('order_user_id_amount_idx', 'user_id', 'amount')
+              )
 
         Table('order', m2,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-            UniqueConstraint('order_id', 'user_id',
-                name='order_order_id_user_id_unique'
-            ),
-            Index('order_user_id_amount_idx', 'user_id', 'amount', unique=True),
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              UniqueConstraint('order_id', 'user_id',
+                               name='order_order_id_user_id_unique'
+                               ),
+              Index('order_user_id_amount_idx', 'user_id', 'amount', unique=True),
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs[0][0], "remove_index")
@@ -103,21 +102,19 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         eq_(diffs[1][1].name, "order_user_id_amount_idx")
         eq_(diffs[1][1].unique, True)
 
-
-
     def test_mismatch_db_named_col_flag(self):
         m1 = MetaData()
         m2 = MetaData()
         Table('item', m1,
-                Column('x', Integer),
-                UniqueConstraint('x', name="db_generated_name")
-            )
+              Column('x', Integer),
+              UniqueConstraint('x', name="db_generated_name")
+              )
 
         # test mismatch between unique=True and
         # named uq constraint
         Table('item', m2,
-                Column('x', Integer, unique=True)
-            )
+              Column('x', Integer, unique=True)
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -127,10 +124,10 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m1 = MetaData()
         m2 = MetaData()
         Table('extra', m2,
-                Column('foo', Integer, index=True),
-                Column('bar', Integer),
-                Index('newtable_idx', 'bar')
-            )
+              Column('foo', Integer, index=True),
+              Column('bar', Integer),
+              Index('newtable_idx', 'bar')
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -142,20 +139,19 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         eq_(diffs[2][0], "add_index")
         eq_(diffs[2][1].name, "newtable_idx")
 
-
     def test_named_cols_changed(self):
         m1 = MetaData()
         m2 = MetaData()
         Table('col_change', m1,
-                Column('x', Integer),
-                Column('y', Integer),
-                UniqueConstraint('x', name="nochange")
-            )
+              Column('x', Integer),
+              Column('y', Integer),
+              UniqueConstraint('x', name="nochange")
+              )
         Table('col_change', m2,
-                Column('x', Integer),
-                Column('y', Integer),
-                UniqueConstraint('x', 'y', name="nochange")
-            )
+              Column('x', Integer),
+              Column('y', Integer),
+              UniqueConstraint('x', 'y', name="nochange")
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -173,72 +169,68 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m2 = MetaData()
 
         Table('nothing_changed', m1,
-            Column('x', String(20), unique=True, index=True)
-            )
+              Column('x', String(20), unique=True, index=True)
+              )
 
         Table('nothing_changed', m2,
-            Column('x', String(20), unique=True, index=True)
-            )
+              Column('x', String(20), unique=True, index=True)
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs, [])
 
-
     def test_nothing_changed_two(self):
         m1 = MetaData()
         m2 = MetaData()
 
         Table('nothing_changed', m1,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20), unique=True),
-            mysql_engine='InnoDB'
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20), unique=True),
+              mysql_engine='InnoDB'
+              )
         Table('nothing_changed_related', m1,
-            Column('id1', Integer),
-            Column('id2', Integer),
-            ForeignKeyConstraint(['id1', 'id2'],
-                    ['nothing_changed.id1', 'nothing_changed.id2']),
-            mysql_engine='InnoDB'
-            )
+              Column('id1', Integer),
+              Column('id2', Integer),
+              ForeignKeyConstraint(['id1', 'id2'],
+                                   ['nothing_changed.id1', 'nothing_changed.id2']),
+              mysql_engine='InnoDB'
+              )
 
         Table('nothing_changed', m2,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20), unique=True),
-            mysql_engine='InnoDB'
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20), unique=True),
+              mysql_engine='InnoDB'
+              )
         Table('nothing_changed_related', m2,
-            Column('id1', Integer),
-            Column('id2', Integer),
-            ForeignKeyConstraint(['id1', 'id2'],
-                    ['nothing_changed.id1', 'nothing_changed.id2']),
-            mysql_engine='InnoDB'
-            )
-
+              Column('id1', Integer),
+              Column('id2', Integer),
+              ForeignKeyConstraint(['id1', 'id2'],
+                                   ['nothing_changed.id1', 'nothing_changed.id2']),
+              mysql_engine='InnoDB'
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs, [])
 
-
-
     def test_nothing_changed_index_named_as_column(self):
         m1 = MetaData()
         m2 = MetaData()
 
         Table('nothing_changed', m1,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20)),
-            Index('x', 'x')
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20)),
+              Index('x', 'x')
+              )
 
         Table('nothing_changed', m2,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20)),
-            Index('x', 'x')
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20)),
+              Index('x', 'x')
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs, [])
@@ -248,28 +240,28 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m2 = MetaData()
 
         Table("nothing_changed", m1,
-                Column('id', Integer, primary_key=True),
-                Column('other_id',
-                            ForeignKey('nc2.id',
+              Column('id', Integer, primary_key=True),
+              Column('other_id',
+                     ForeignKey('nc2.id',
                                 name='fk_my_table_other_table'
                                 ),
-                                nullable=False),
-                Column('foo', Integer),
-                mysql_engine='InnoDB')
+                     nullable=False),
+              Column('foo', Integer),
+              mysql_engine='InnoDB')
         Table('nc2', m1,
-                Column('id', Integer, primary_key=True),
-                mysql_engine='InnoDB')
+              Column('id', Integer, primary_key=True),
+              mysql_engine='InnoDB')
 
         Table("nothing_changed", m2,
-                Column('id', Integer, primary_key=True),
-                Column('other_id', ForeignKey('nc2.id',
-                                    name='fk_my_table_other_table'),
-                                    nullable=False),
-                Column('foo', Integer),
-                mysql_engine='InnoDB')
+              Column('id', Integer, primary_key=True),
+              Column('other_id', ForeignKey('nc2.id',
+                                            name='fk_my_table_other_table'),
+                     nullable=False),
+              Column('foo', Integer),
+              mysql_engine='InnoDB')
         Table('nc2', m2,
-                Column('id', Integer, primary_key=True),
-                mysql_engine='InnoDB')
+              Column('id', Integer, primary_key=True),
+              mysql_engine='InnoDB')
         diffs = self._fixture(m1, m2)
         eq_(diffs, [])
 
@@ -278,18 +270,18 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m2 = MetaData()
 
         Table('new_idx', m1,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20)),
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20)),
+              )
 
         idx = Index('x', 'x')
         Table('new_idx', m2,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20)),
-            idx
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20)),
+              idx
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs, [('add_index', idx)])
@@ -300,17 +292,17 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
 
         idx = Index('x', 'x')
         Table('new_idx', m1,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20)),
-            idx
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20)),
+              idx
+              )
 
         Table('new_idx', m2,
-            Column('id1', Integer, primary_key=True),
-            Column('id2', Integer, primary_key=True),
-            Column('x', String(20))
-            )
+              Column('id1', Integer, primary_key=True),
+              Column('id2', Integer, primary_key=True),
+              Column('x', String(20))
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs[0][0], 'remove_index')
@@ -319,38 +311,36 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         m1 = MetaData()
         m2 = MetaData()
         Table('col_change', m1,
-                Column('x', Integer),
-                Column('y', Integer),
-                UniqueConstraint('x')
-            )
+              Column('x', Integer),
+              Column('y', Integer),
+              UniqueConstraint('x')
+              )
         Table('col_change', m2,
-                Column('x', Integer),
-                Column('y', Integer),
-                UniqueConstraint('x', 'y')
-            )
+              Column('x', Integer),
+              Column('y', Integer),
+              UniqueConstraint('x', 'y')
+              )
 
         diffs = self._fixture(m1, m2)
 
         diffs = set((cmd,
-                    ('x' in obj.name) if obj.name is not None else False)
+                     ('x' in obj.name) if obj.name is not None else False)
                     for cmd, obj in diffs)
         if self.reports_unnamed_constraints:
             assert ("remove_constraint", True) in diffs
             assert ("add_constraint", False) in diffs
 
-
-
     def test_remove_named_unique_index(self):
         m1 = MetaData()
         m2 = MetaData()
 
         Table('remove_idx', m1,
-                Column('x', Integer),
-                Index('xidx', 'x', unique=True)
-            )
+              Column('x', Integer),
+              Index('xidx', 'x', unique=True)
+              )
         Table('remove_idx', m2,
-                Column('x', Integer),
-            )
+              Column('x', Integer),
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -360,18 +350,17 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         else:
             eq_(diffs, [])
 
-
     def test_remove_named_unique_constraint(self):
         m1 = MetaData()
         m2 = MetaData()
 
         Table('remove_idx', m1,
-                Column('x', Integer),
-                UniqueConstraint('x', name='xidx')
-            )
+              Column('x', Integer),
+              UniqueConstraint('x', name='xidx')
+              )
         Table('remove_idx', m2,
-                Column('x', Integer),
-            )
+              Column('x', Integer),
+              )
 
         diffs = self._fixture(m1, m2)
 
@@ -437,7 +426,6 @@ class AutogenerateUniqueIndexTest(AutogenFixtureTest, TestCase):
         eq_(diffs, [])
 
 
-
 class PGUniqueIndexTest(AutogenerateUniqueIndexTest):
     reports_unnamed_constraints = True
 
@@ -450,7 +438,7 @@ class PGUniqueIndexTest(AutogenerateUniqueIndexTest):
         m2 = MetaData()
         Table('add_ix', m1, Column('x', String(50)), schema="test_schema")
         Table('add_ix', m2, Column('x', String(50)),
-                Index('ix_1', 'x'), schema="test_schema")
+              Index('ix_1', 'x'), schema="test_schema")
 
         diffs = self._fixture(m1, m2, include_schemas=True)
         eq_(diffs[0][0], "add_index")
@@ -460,9 +448,9 @@ class PGUniqueIndexTest(AutogenerateUniqueIndexTest):
         m1 = MetaData()
         m2 = MetaData()
         Table('add_ix', m1, Column('x', String(50)), Index('ix_1', 'x'),
-                    schema="test_schema")
+              schema="test_schema")
         Table('add_ix', m2, Column('x', String(50)),
-                Index('ix_1', 'x'), schema="test_schema")
+              Index('ix_1', 'x'), schema="test_schema")
 
         diffs = self._fixture(m1, m2, include_schemas=True)
         eq_(diffs, [])
@@ -472,7 +460,7 @@ class PGUniqueIndexTest(AutogenerateUniqueIndexTest):
         m2 = MetaData()
         Table('add_uq', m1, Column('x', String(50)), schema="test_schema")
         Table('add_uq', m2, Column('x', String(50)),
-                UniqueConstraint('x', name='ix_1'), schema="test_schema")
+              UniqueConstraint('x', name='ix_1'), schema="test_schema")
 
         diffs = self._fixture(m1, m2, include_schemas=True)
         eq_(diffs[0][0], "add_constraint")
@@ -482,11 +470,11 @@ class PGUniqueIndexTest(AutogenerateUniqueIndexTest):
         m1 = MetaData()
         m2 = MetaData()
         Table('add_uq', m1, Column('x', String(50)),
-                    UniqueConstraint('x', name='ix_1'),
-                    schema="test_schema")
+              UniqueConstraint('x', name='ix_1'),
+              schema="test_schema")
         Table('add_uq', m2, Column('x', String(50)),
-                    UniqueConstraint('x', name='ix_1'),
-                schema="test_schema")
+              UniqueConstraint('x', name='ix_1'),
+              schema="test_schema")
 
         diffs = self._fixture(m1, m2, include_schemas=True)
         eq_(diffs, [])
@@ -511,7 +499,7 @@ class MySQLUniqueIndexTest(AutogenerateUniqueIndexTest):
     def test_removed_idx_index_named_as_column(self):
         try:
             super(MySQLUniqueIndexTest,
-                                self).test_removed_idx_index_named_as_column()
+                  self).test_removed_idx_index_named_as_column()
         except IndexError:
             assert True
         else:
@@ -521,6 +509,7 @@ class MySQLUniqueIndexTest(AutogenerateUniqueIndexTest):
     def _get_bind(cls):
         return db_for_dialect('mysql')
 
+
 class NoUqReflectionIndexTest(AutogenerateUniqueIndexTest):
     reports_unique_constraints = False
 
@@ -536,13 +525,13 @@ class NoUqReflectionIndexTest(AutogenerateUniqueIndexTest):
     def test_unique_not_reported(self):
         m1 = MetaData()
         Table('order', m1,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-            UniqueConstraint('order_id', 'user_id',
-                name='order_order_id_user_id_unique'
-            )
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              UniqueConstraint('order_id', 'user_id',
+                               name='order_order_id_user_id_unique'
+                               )
+              )
 
         diffs = self._fixture(m1, m1)
         eq_(diffs, [])
@@ -550,19 +539,19 @@ class NoUqReflectionIndexTest(AutogenerateUniqueIndexTest):
     def test_remove_unique_index_not_reported(self):
         m1 = MetaData()
         Table('order', m1,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-            Index('oid_ix', 'order_id', 'user_id',
-                unique=True
-            )
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              Index('oid_ix', 'order_id', 'user_id',
+                    unique=True
+                    )
+              )
         m2 = MetaData()
         Table('order', m2,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs, [])
@@ -570,23 +559,24 @@ class NoUqReflectionIndexTest(AutogenerateUniqueIndexTest):
     def test_remove_plain_index_is_reported(self):
         m1 = MetaData()
         Table('order', m1,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-            Index('oid_ix', 'order_id', 'user_id')
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              Index('oid_ix', 'order_id', 'user_id')
+              )
         m2 = MetaData()
         Table('order', m2,
-            Column('order_id', Integer, primary_key=True),
-            Column('amount', Numeric(10, 2), nullable=True),
-            Column('user_id', Integer),
-        )
+              Column('order_id', Integer, primary_key=True),
+              Column('amount', Numeric(10, 2), nullable=True),
+              Column('user_id', Integer),
+              )
 
         diffs = self._fixture(m1, m2)
         eq_(diffs[0][0], 'remove_index')
 
 
 class NoUqReportsIndAsUqTest(NoUqReflectionIndexTest):
+
     """this test suite simulates the condition where:
 
     a. the dialect doesn't report unique constraints
@@ -612,8 +602,8 @@ class NoUqReportsIndAsUqTest(NoUqReflectionIndexTest):
         def get_indexes(self, connection, tablename, **kw):
             indexes = _get_indexes(self, connection, tablename, **kw)
             for uq in _get_unique_constraints(
-                            self, connection, tablename, **kw
-                            ):
+                self, connection, tablename, **kw
+            ):
                 uq['unique'] = True
                 indexes.append(uq)
             return indexes
@@ -621,4 +611,3 @@ class NoUqReportsIndAsUqTest(NoUqReflectionIndexTest):
         eng.dialect.get_unique_constraints = unimpl
         eng.dialect.get_indexes = get_indexes
         return eng
-