Run black -l 79 against all source files

This is a straight reformat run using black as is, with no edits
applied at all.

The black run will format code consistently, however in
some cases that are prevalent in SQLAlchemy code it produces
too-long lines.   The too-long lines will be resolved in the
following commit that will resolve all remaining flake8 issues
including shadowed builtins, long lines, import order, unused
imports, duplicate imports, and docstring issues.

Change-Id: I7eda77fed3d8e73df84b3651fd6cfcfe858d4dc9

1 files changed, 103 insertions, 81 deletions

diff --git a/test/ext/test_orderinglist.py b/test/ext/test_orderinglist.py
index 59c1a5161..c417c7153 100644
--- a/test/ext/test_orderinglist.py
+++ b/test/ext/test_orderinglist.py
@@ -13,8 +13,10 @@ metadata = None
 
 def step_numbering(step):
     """ order in whole steps """
+
     def f(index, collection):
         return step * index
+
     return f
 
 
@@ -24,14 +26,17 @@ def fibonacci_numbering(order_col):
     e.g. 1, 2, 3, 5, 8, ... instead of 0, 1, 1, 2, 3, ...
     otherwise ordering of the elements at '1' is undefined... ;)
     """
+
     def f(index, collection):
         if index == 0:
             return 1
         elif index == 1:
             return 2
         else:
-            return (getattr(collection[index - 1], order_col) +
-                    getattr(collection[index - 2], order_col))
+            return getattr(collection[index - 1], order_col) + getattr(
+                collection[index - 2], order_col
+            )
+
     return f
 
 
@@ -39,7 +44,7 @@ def alpha_ordering(index, collection):
     """
     0 -> A, 1 -> B, ... 25 -> Z, 26 -> AA, 27 -> AB, ...
     """
-    s = ''
+    s = ""
     while index > 25:
         d = index / 26
         s += chr((d % 26) + 64)
@@ -61,17 +66,24 @@ class OrderingListTest(fixtures.TestBase):
 
         global metadata, slides_table, bullets_table, Slide, Bullet
 
-        slides_table = Table('test_Slides', metadata,
-                             Column('id', Integer, primary_key=True,
-                                    test_needs_autoincrement=True),
-                             Column('name', String(128)))
-        bullets_table = Table('test_Bullets', metadata,
-                              Column('id', Integer, primary_key=True,
-                                     test_needs_autoincrement=True),
-                              Column('slide_id', Integer,
-                                     ForeignKey('test_Slides.id')),
-                              Column('position', Integer),
-                              Column('text', String(128)))
+        slides_table = Table(
+            "test_Slides",
+            metadata,
+            Column(
+                "id", Integer, primary_key=True, test_needs_autoincrement=True
+            ),
+            Column("name", String(128)),
+        )
+        bullets_table = Table(
+            "test_Bullets",
+            metadata,
+            Column(
+                "id", Integer, primary_key=True, test_needs_autoincrement=True
+            ),
+            Column("slide_id", Integer, ForeignKey("test_Slides.id")),
+            Column("position", Integer),
+            Column("text", String(128)),
+        )
 
         class Slide(object):
             def __init__(self, name):
@@ -87,11 +99,19 @@ class OrderingListTest(fixtures.TestBase):
             def __repr__(self):
                 return '<Bullet "%s" pos %s>' % (self.text, self.position)
 
-        mapper(Slide, slides_table, properties={
-            'bullets': relationship(Bullet, lazy='joined',
-                                    collection_class=test_collection_class,
-                                    backref='slide',
-                                    order_by=[bullets_table.c.position])})
+        mapper(
+            Slide,
+            slides_table,
+            properties={
+                "bullets": relationship(
+                    Bullet,
+                    lazy="joined",
+                    collection_class=test_collection_class,
+                    backref="slide",
+                    order_by=[bullets_table.c.position],
+                )
+            },
+        )
         mapper(Bullet, bullets_table)
 
         metadata.create_all()
@@ -100,27 +120,28 @@ class OrderingListTest(fixtures.TestBase):
         metadata.drop_all()
 
     def test_append_no_reorder(self):
-        self._setup(ordering_list('position', count_from=1,
-                                  reorder_on_append=False))
+        self._setup(
+            ordering_list("position", count_from=1, reorder_on_append=False)
+        )
 
-        s1 = Slide('Slide #1')
+        s1 = Slide("Slide #1")
 
         self.assert_(not s1.bullets)
         self.assert_(len(s1.bullets) == 0)
 
-        s1.bullets.append(Bullet('s1/b1'))
+        s1.bullets.append(Bullet("s1/b1"))
 
         self.assert_(s1.bullets)
         self.assert_(len(s1.bullets) == 1)
         self.assert_(s1.bullets[0].position == 1)
 
-        s1.bullets.append(Bullet('s1/b2'))
+        s1.bullets.append(Bullet("s1/b2"))
 
         self.assert_(len(s1.bullets) == 2)
         self.assert_(s1.bullets[0].position == 1)
         self.assert_(s1.bullets[1].position == 2)
 
-        bul = Bullet('s1/b100')
+        bul = Bullet("s1/b100")
         bul.position = 100
         s1.bullets.append(bul)
 
@@ -128,7 +149,7 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(s1.bullets[1].position == 2)
         self.assert_(s1.bullets[2].position == 100)
 
-        s1.bullets.append(Bullet('s1/b4'))
+        s1.bullets.append(Bullet("s1/b4"))
         self.assert_(s1.bullets[0].position == 1)
         self.assert_(s1.bullets[1].position == 2)
         self.assert_(s1.bullets[2].position == 100)
@@ -153,33 +174,34 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(srt.bullets)
         self.assert_(len(srt.bullets) == 4)
 
-        titles = ['s1/b1', 's1/b2', 's1/b100', 's1/b4']
+        titles = ["s1/b1", "s1/b2", "s1/b100", "s1/b4"]
         found = [b.text for b in srt.bullets]
 
         self.assert_(titles == found)
 
     def test_append_reorder(self):
-        self._setup(ordering_list('position', count_from=1,
-                                  reorder_on_append=True))
+        self._setup(
+            ordering_list("position", count_from=1, reorder_on_append=True)
+        )
 
-        s1 = Slide('Slide #1')
+        s1 = Slide("Slide #1")
 
         self.assert_(not s1.bullets)
         self.assert_(len(s1.bullets) == 0)
 
-        s1.bullets.append(Bullet('s1/b1'))
+        s1.bullets.append(Bullet("s1/b1"))
 
         self.assert_(s1.bullets)
         self.assert_(len(s1.bullets) == 1)
         self.assert_(s1.bullets[0].position == 1)
 
-        s1.bullets.append(Bullet('s1/b2'))
+        s1.bullets.append(Bullet("s1/b2"))
 
         self.assert_(len(s1.bullets) == 2)
         self.assert_(s1.bullets[0].position == 1)
         self.assert_(s1.bullets[1].position == 2)
 
-        bul = Bullet('s1/b100')
+        bul = Bullet("s1/b100")
         bul.position = 100
         s1.bullets.append(bul)
 
@@ -187,7 +209,7 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(s1.bullets[1].position == 2)
         self.assert_(s1.bullets[2].position == 3)
 
-        s1.bullets.append(Bullet('s1/b4'))
+        s1.bullets.append(Bullet("s1/b4"))
         self.assert_(s1.bullets[0].position == 1)
         self.assert_(s1.bullets[1].position == 2)
         self.assert_(s1.bullets[2].position == 3)
@@ -199,7 +221,7 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(s1.bullets[2].position == 3)
         self.assert_(s1.bullets[3].position == 4)
 
-        s1.bullets._raw_append(Bullet('raw'))
+        s1.bullets._raw_append(Bullet("raw"))
         self.assert_(s1.bullets[4].position is None)
 
         s1.bullets._reorder()
@@ -217,46 +239,46 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(srt.bullets)
         self.assert_(len(srt.bullets) == 5)
 
-        titles = ['s1/b1', 's1/b2', 's1/b100', 's1/b4', 'raw']
+        titles = ["s1/b1", "s1/b2", "s1/b100", "s1/b4", "raw"]
         found = [b.text for b in srt.bullets]
         eq_(titles, found)
 
-        srt.bullets._raw_append(Bullet('raw2'))
+        srt.bullets._raw_append(Bullet("raw2"))
         srt.bullets[-1].position = 6
         session.flush()
         session.expunge_all()
 
         srt = session.query(Slide).get(id)
-        titles = ['s1/b1', 's1/b2', 's1/b100', 's1/b4', 'raw', 'raw2']
+        titles = ["s1/b1", "s1/b2", "s1/b100", "s1/b4", "raw", "raw2"]
         found = [b.text for b in srt.bullets]
         eq_(titles, found)
 
     def test_insert(self):
-        self._setup(ordering_list('position'))
+        self._setup(ordering_list("position"))
 
-        s1 = Slide('Slide #1')
-        s1.bullets.append(Bullet('1'))
-        s1.bullets.append(Bullet('2'))
-        s1.bullets.append(Bullet('3'))
-        s1.bullets.append(Bullet('4'))
+        s1 = Slide("Slide #1")
+        s1.bullets.append(Bullet("1"))
+        s1.bullets.append(Bullet("2"))
+        s1.bullets.append(Bullet("3"))
+        s1.bullets.append(Bullet("4"))
 
         self.assert_(s1.bullets[0].position == 0)
         self.assert_(s1.bullets[1].position == 1)
         self.assert_(s1.bullets[2].position == 2)
         self.assert_(s1.bullets[3].position == 3)
 
-        s1.bullets.insert(2, Bullet('insert_at_2'))
+        s1.bullets.insert(2, Bullet("insert_at_2"))
         self.assert_(s1.bullets[0].position == 0)
         self.assert_(s1.bullets[1].position == 1)
         self.assert_(s1.bullets[2].position == 2)
         self.assert_(s1.bullets[3].position == 3)
         self.assert_(s1.bullets[4].position == 4)
 
-        self.assert_(s1.bullets[1].text == '2')
-        self.assert_(s1.bullets[2].text == 'insert_at_2')
-        self.assert_(s1.bullets[3].text == '3')
+        self.assert_(s1.bullets[1].text == "2")
+        self.assert_(s1.bullets[2].text == "insert_at_2")
+        self.assert_(s1.bullets[3].text == "3")
 
-        s1.bullets.insert(999, Bullet('999'))
+        s1.bullets.insert(999, Bullet("999"))
 
         self.assert_(len(s1.bullets) == 6)
         self.assert_(s1.bullets[5].position == 5)
@@ -274,17 +296,23 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(srt.bullets)
         self.assert_(len(srt.bullets) == 6)
 
-        texts = ['1', '2', 'insert_at_2', '3', '4', '999']
+        texts = ["1", "2", "insert_at_2", "3", "4", "999"]
         found = [b.text for b in srt.bullets]
 
         self.assert_(texts == found)
 
     def test_slice(self):
-        self._setup(ordering_list('position'))
-
-        b = [Bullet('1'), Bullet('2'), Bullet('3'),
-             Bullet('4'), Bullet('5'), Bullet('6')]
-        s1 = Slide('Slide #1')
+        self._setup(ordering_list("position"))
+
+        b = [
+            Bullet("1"),
+            Bullet("2"),
+            Bullet("3"),
+            Bullet("4"),
+            Bullet("5"),
+            Bullet("6"),
+        ]
+        s1 = Slide("Slide #1")
 
         # 1, 2, 3
         s1.bullets[0:3] = b[0:3]
@@ -317,16 +345,16 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(srt.bullets)
         self.assert_(len(srt.bullets) == 3)
 
-        texts = ['1', '6', '3']
+        texts = ["1", "6", "3"]
         for i, text in enumerate(texts):
             self.assert_(srt.bullets[i].position == i)
             self.assert_(srt.bullets[i].text == text)
 
     def test_replace(self):
-        self._setup(ordering_list('position'))
+        self._setup(ordering_list("position"))
 
-        s1 = Slide('Slide #1')
-        s1.bullets = [Bullet('1'), Bullet('2'), Bullet('3')]
+        s1 = Slide("Slide #1")
+        s1.bullets = [Bullet("1"), Bullet("2"), Bullet("3")]
 
         self.assert_(len(s1.bullets) == 3)
         self.assert_(s1.bullets[2].position == 2)
@@ -335,7 +363,7 @@ class OrderingListTest(fixtures.TestBase):
         session.add(s1)
         session.flush()
 
-        new_bullet = Bullet('new 2')
+        new_bullet = Bullet("new 2")
         self.assert_(new_bullet.position is None)
 
         # mark existing bullet as db-deleted before replacement.
@@ -355,37 +383,32 @@ class OrderingListTest(fixtures.TestBase):
         self.assert_(srt.bullets)
         self.assert_(len(srt.bullets) == 3)
 
-        self.assert_(srt.bullets[1].text == 'new 2')
-        self.assert_(srt.bullets[2].text == '3')
+        self.assert_(srt.bullets[1].text == "new 2")
+        self.assert_(srt.bullets[2].text == "3")
 
     def test_replace_two(self):
         """test #3191"""
 
-        self._setup(ordering_list('position', reorder_on_append=True))
+        self._setup(ordering_list("position", reorder_on_append=True))
 
-        s1 = Slide('Slide #1')
+        s1 = Slide("Slide #1")
 
-        b1, b2, b3, b4 = Bullet('1'), Bullet('2'), Bullet('3'), Bullet('4')
+        b1, b2, b3, b4 = Bullet("1"), Bullet("2"), Bullet("3"), Bullet("4")
         s1.bullets = [b1, b2, b3]
 
-        eq_(
-            [b.position for b in s1.bullets],
-            [0, 1, 2]
-        )
+        eq_([b.position for b in s1.bullets], [0, 1, 2])
 
         s1.bullets = [b4, b2, b1]
-        eq_(
-            [b.position for b in s1.bullets],
-            [0, 1, 2]
-        )
+        eq_([b.position for b in s1.bullets], [0, 1, 2])
 
     def test_funky_ordering(self):
         class Pos(object):
             def __init__(self):
                 self.position = None
 
-        step_factory = ordering_list('position',
-                                     ordering_func=step_numbering(2))
+        step_factory = ordering_list(
+            "position", ordering_func=step_numbering(2)
+        )
 
         stepped = step_factory()
         stepped.append(Pos())
@@ -397,8 +420,8 @@ class OrderingListTest(fixtures.TestBase):
             self.assert_(stepped[li].position == pos)
 
         fib_factory = ordering_list(
-            'position',
-            ordering_func=fibonacci_numbering('position'))
+            "position", ordering_func=fibonacci_numbering("position")
+        )
 
         fibbed = fib_factory()
         fibbed.append(Pos())
@@ -426,8 +449,7 @@ class OrderingListTest(fixtures.TestBase):
         ):
             self.assert_(fibbed[li].position == pos)
 
-        alpha_factory = ordering_list('position',
-                                      ordering_func=alpha_ordering)
+        alpha_factory = ordering_list("position", ordering_func=alpha_ordering)
         alpha = alpha_factory()
         alpha.append(Pos())
         alpha.append(Pos())
@@ -435,13 +457,13 @@ class OrderingListTest(fixtures.TestBase):
 
         alpha.insert(1, Pos())
 
-        for li, pos in (0, 'A'), (1, 'B'), (2, 'C'), (3, 'D'):
+        for li, pos in (0, "A"), (1, "B"), (2, "C"), (3, "D"):
             self.assert_(alpha[li].position == pos)
 
     def test_picklability(self):
         from sqlalchemy.ext.orderinglist import OrderingList
 
-        olist = OrderingList('order', reorder_on_append=True)
+        olist = OrderingList("order", reorder_on_append=True)
         olist.append(DummyItem())
 
         for loads, dumps in picklers():