Enable F841

This is a very useful assertion which prevents unused variables
from being set up allows code to be more readable and sometimes
even more efficient.  test suites seem to be where the most
problems are and there do not seem to be documentation examples
that are using this, or at least the linter is not taking effect
within rst blocks.

Change-Id: I2b3341d8dd14da34879d8425838e66a4b9f8e27d

1 files changed, 26 insertions, 82 deletions

diff --git a/test/orm/test_joins.py b/test/orm/test_joins.py
index 69b6d061a..ebef64d27 100644
--- a/test/orm/test_joins.py
+++ b/test/orm/test_joins.py
@@ -662,7 +662,6 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_left_is_none_and_query_has_no_entities(self):
-        User = self.classes.User
         Address = self.classes.Address
 
         sess = create_session()
@@ -739,12 +738,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_1(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        User = self.classes.User
 
         sess = create_session()
         self.assert_compile(
@@ -754,12 +748,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_2(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         self.assert_compile(
@@ -769,12 +758,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_3(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         oalias1 = aliased(Order)
@@ -787,12 +771,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_4(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User, = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         oalias1 = aliased(Order)
@@ -808,12 +787,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_5(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User, = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         self.assert_compile(
@@ -826,12 +800,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_6(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        User = self.classes.User
 
         sess = create_session()
         ualias = aliased(User)
@@ -842,12 +811,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_7(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         # this query is somewhat nonsensical.  the old system didn't render a
@@ -865,12 +829,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_8(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        Order, User, = (self.classes.Order, self.classes.User)
 
         sess = create_session()
         # same as before using an aliased() for User as well
@@ -887,12 +846,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_9(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        User = self.classes.User
 
         sess = create_session()
         self.assert_compile(
@@ -909,12 +863,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_10(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
-            self.classes.Order,
-            self.classes.User,
-            self.classes.Address,
-        )
+        User, Address = (self.classes.User, self.classes.Address)
 
         sess = create_session()
         self.assert_compile(
@@ -928,11 +877,10 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_11(self):
-        Item, Order, User, Address = (
+        Item, Order, User, = (
             self.classes.Item,
             self.classes.Order,
             self.classes.User,
-            self.classes.Address,
         )
 
         sess = create_session()
@@ -950,8 +898,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_12(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
+        Order, User, Address = (
             self.classes.Order,
             self.classes.User,
             self.classes.Address,
@@ -972,8 +919,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
         )
 
     def test_single_prop_13(self):
-        Item, Order, User, Address = (
-            self.classes.Item,
+        Order, User, Address = (
             self.classes.Order,
             self.classes.User,
             self.classes.Address,
@@ -1561,10 +1507,9 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
 
     def test_clause_present_in_froms_twice_w_onclause(self):
         # test [ticket:4584]
-        Order, Address, Dingaling, User = (
+        Order, Address, User = (
             self.classes.Order,
             self.classes.Address,
-            self.classes.Dingaling,
             self.classes.User,
         )
 
@@ -1605,8 +1550,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
 
     def test_clause_present_in_froms_twice_wo_onclause(self):
         # test [ticket:4584]
-        Order, Address, Dingaling, User = (
-            self.classes.Order,
+        Address, Dingaling, User = (
             self.classes.Address,
             self.classes.Dingaling,
             self.classes.User,
@@ -1737,7 +1681,7 @@ class JoinTest(QueryTest, AssertsCompiledSQL):
 
         sess = create_session()
         # no arg error
-        result = (
+        (
             sess.query(User)
             .join("orders", aliased=True)
             .order_by(Order.id)
@@ -2688,7 +2632,7 @@ class JoinFromSelectableTest(fixtures.MappedTest, AssertsCompiledSQL):
 class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL):
     @classmethod
     def define_tables(cls, metadata):
-        t1 = Table(
+        Table(
             "t1",
             metadata,
             Column(
@@ -2696,7 +2640,7 @@ class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL):
             ),
             Column("data", String(30)),
         )
-        t2 = Table(
+        Table(
             "t2",
             metadata,
             Column(
@@ -2705,14 +2649,14 @@ class MultiplePathTest(fixtures.MappedTest, AssertsCompiledSQL):
             Column("data", String(30)),
         )
 
-        t1t2_1 = Table(
+        Table(
             "t1t2_1",
             metadata,
             Column("t1id", Integer, ForeignKey("t1.id")),
             Column("t2id", Integer, ForeignKey("t2.id")),
         )
 
-        t1t2_2 = Table(
+        Table(
             "t1t2_2",
             metadata,
             Column("t1id", Integer, ForeignKey("t1.id")),
@@ -2769,7 +2713,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL):
 
     @classmethod
     def define_tables(cls, metadata):
-        nodes = Table(
+        Table(
             "nodes",
             metadata,
             Column(
@@ -2778,7 +2722,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL):
             Column("parent_id", Integer, ForeignKey("nodes.id")),
         )
 
-        sub_table = Table(
+        Table(
             "sub_table",
             metadata,
             Column(
@@ -2787,7 +2731,7 @@ class SelfRefMixedTest(fixtures.MappedTest, AssertsCompiledSQL):
             Column("node_id", Integer, ForeignKey("nodes.id")),
         )
 
-        assoc_table = Table(
+        Table(
             "assoc_table",
             metadata,
             Column("left_id", Integer, ForeignKey("nodes.id")),
@@ -2994,7 +2938,7 @@ class JoinToNonPolyAliasesTest(fixtures.MappedTest, AssertsCompiledSQL):
 
     def test_join_parent_child(self):
         Parent = self.classes.Parent
-        npc = self.npc
+
         sess = Session()
         self.assert_compile(
             sess.query(Parent)
@@ -3749,7 +3693,7 @@ class SelfReferentialM2MTest(fixtures.MappedTest):
 
     @classmethod
     def define_tables(cls, metadata):
-        nodes = Table(
+        Table(
             "nodes",
             metadata,
             Column(
@@ -3758,7 +3702,7 @@ class SelfReferentialM2MTest(fixtures.MappedTest):
             Column("data", String(30)),
         )
 
-        node_to_nodes = Table(
+        Table(
             "node_to_nodes",
             metadata,
             Column(