summaryrefslogtreecommitdiff
path: root/test/orm/test_merge.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2019-05-30 11:31:03 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2019-06-20 13:50:41 -0400
commit190e0139e834e4271268652e058c280787ae69eb (patch)
tree21e93907a58cd2f390f687ddc5e0c1da1eb25454 /test/orm/test_merge.py
parentff8e7732b9f656f8cea05544660c18d57dd37864 (diff)
downloadsqlalchemy-190e0139e834e4271268652e058c280787ae69eb.tar.gz
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
Diffstat (limited to 'test/orm/test_merge.py')
-rw-r--r--test/orm/test_merge.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/test/orm/test_merge.py b/test/orm/test_merge.py
index 27d6c4bfd..b5e1ee415 100644
--- a/test/orm/test_merge.py
+++ b/test/orm/test_merge.py
@@ -98,7 +98,7 @@ class MergeTest(_fixtures.FixtureTest):
"Instance <User.*> is already pending in this Session yet is "
"being merged again; this is probably not what you want to do"
):
- u2 = sess.merge(u)
+ sess.merge(u)
def test_warn_transient_already_pending_pk(self):
User, users = self.classes.User, self.tables.users
@@ -113,7 +113,7 @@ class MergeTest(_fixtures.FixtureTest):
"Instance <User.*> is already pending in this Session yet is "
"being merged again; this is probably not what you want to do"
):
- u2 = sess.merge(u)
+ sess.merge(u)
def test_transient_to_pending_collection(self):
User, Address, addresses, users = (
@@ -543,7 +543,7 @@ class MergeTest(_fixtures.FixtureTest):
# attribute maintains modified state.
# (usually autoflush would have happened
# here anyway).
- u4 = sess.merge(User(id=2))
+ u4 = sess.merge(User(id=2)) # noqa
eq_(u3.__dict__["data"], "bar")
sess.flush()
@@ -571,7 +571,7 @@ class MergeTest(_fixtures.FixtureTest):
# set it to None. this is actually
# a change so gets preserved.
u6.data = None
- u7 = sess.merge(User(id=3))
+ u7 = sess.merge(User(id=3)) # noqa
assert u6.__dict__["data"] is None
def test_merge_irregular_collection(self):
@@ -1165,7 +1165,7 @@ class MergeTest(_fixtures.FixtureTest):
u2 = sess2.query(User).options(sa.orm.joinedload("addresses")).get(7)
sess3 = create_session()
- u3 = sess3.merge(u2, load=False)
+ u3 = sess3.merge(u2, load=False) # noqa
def go():
sess3.flush()
@@ -1204,7 +1204,7 @@ class MergeTest(_fixtures.FixtureTest):
u2 = sess2.query(User).get(7)
sess3 = create_session()
- u3 = sess3.merge(u2, load=False)
+ u3 = sess3.merge(u2, load=False) # noqa
assert not sess3.dirty
def go():
@@ -1407,7 +1407,7 @@ class MergeTest(_fixtures.FixtureTest):
)
sess = create_session(autoflush=True, autocommit=False)
- m = mapper(
+ mapper(
User,
users,
properties={
@@ -1722,7 +1722,7 @@ class M2ONoUseGetLoadingTest(fixtures.MappedTest):
def go():
u1 = User(id=1, addresses=[Address(id=1), Address(id=2)])
- u2 = s.merge(u1)
+ s.merge(u1)
self.assert_sql_count(testing.db, go, 2)
@@ -1987,13 +1987,13 @@ class LoadOnPendingTest(fixtures.MappedTest):
@classmethod
def define_tables(cls, metadata):
- rocks_table = Table(
+ Table(
"rocks",
metadata,
Column("id", Integer, primary_key=True),
Column("description", String(10)),
)
- bugs_table = Table(
+ Table(
"bugs",
metadata,
Column("id", Integer, primary_key=True),