From e36c850da4f9aca5a3d8eec08bf6fd9dff244854 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 24 Jan 2019 09:53:02 -0500 Subject: [PATCH 1/5] == instead of is for string comparison --- src/allmydata/web/filenode.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allmydata/web/filenode.py b/src/allmydata/web/filenode.py index 35052474b..e448e4b3b 100644 --- a/src/allmydata/web/filenode.py +++ b/src/allmydata/web/filenode.py @@ -370,7 +370,7 @@ class FileDownloader(rend.Page): def parse_range(r): first, last = r.split('-', 1) - if first is '': + if first == '': # suffix-byte-range-spec first = filesize - long(last) last = filesize - 1 @@ -381,7 +381,7 @@ class FileDownloader(rend.Page): first = long(first) # last-byte-pos - if last is '': + if last == '': last = filesize - 1 else: last = long(last) From 252f9eb23a6ea1e1e3e2a2c9bb638e333f3bbcc7 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 24 Jan 2019 09:53:49 -0500 Subject: [PATCH 2/5] This code has pyflakes warnings *and* is dead. --- src/allmydata/test/test_util.py | 49 --------------------------------- 1 file changed, 49 deletions(-) diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index ac76e1d51..b49b83a50 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -1367,55 +1367,6 @@ class DictUtil(unittest.TestCase): self.failUnless(len(d1) == 3, "%s, %s" % (len(d1), d1,)) self.failUnless(len(d2) == 3) - def _help_test_eq_but_notis(self, klass): - d = klass({'a': 3, 'b': EqButNotIs(3), 'c': 3}) - d.pop('b') - - d.clear() - d['a'] = 3 - d['b'] = EqButNotIs(3) - d['c'] = 3 - d.pop('b') - - d.clear() - d['b'] = EqButNotIs(3) - d['a'] = 3 - d['c'] = 3 - d.pop('b') - - d.clear() - d['a'] = EqButNotIs(3) - d['c'] = 3 - d['a'] = 3 - - d.clear() - fake3 = EqButNotIs(3) - fake7 = EqButNotIs(7) - d[fake3] = fake7 - d[3] = 7 - d[3] = 8 - self.failUnless(filter(lambda x: x is 8, d.itervalues())) - self.failUnless(filter(lambda x: x is fake7, d.itervalues())) - # The real 7 should have been ejected by the d[3] = 8. - self.failUnless(not filter(lambda x: x is 7, d.itervalues())) - self.failUnless(filter(lambda x: x is fake3, d.iterkeys())) - self.failUnless(filter(lambda x: x is 3, d.iterkeys())) - d[fake3] = 8 - - d.clear() - d[3] = 7 - fake3 = EqButNotIs(3) - fake7 = EqButNotIs(7) - d[fake3] = fake7 - d[3] = 8 - self.failUnless(filter(lambda x: x is 8, d.itervalues())) - self.failUnless(filter(lambda x: x is fake7, d.itervalues())) - # The real 7 should have been ejected by the d[3] = 8. - self.failUnless(not filter(lambda x: x is 7, d.itervalues())) - self.failUnless(filter(lambda x: x is fake3, d.iterkeys())) - self.failUnless(filter(lambda x: x is 3, d.iterkeys())) - d[fake3] = 8 - def test_dict_of_sets(self): ds = dictutil.DictOfSets() ds.add(1, "a") From dcb4a218b100e56a7360cef8d6f3be23631dce58 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 24 Jan 2019 09:55:40 -0500 Subject: [PATCH 3/5] This nearby code is also dead. --- src/allmydata/test/test_util.py | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/allmydata/test/test_util.py b/src/allmydata/test/test_util.py index b49b83a50..ded4b2fc2 100644 --- a/src/allmydata/test/test_util.py +++ b/src/allmydata/test/test_util.py @@ -1351,22 +1351,6 @@ class EqButNotIs: return self.x == other class DictUtil(unittest.TestCase): - def _help_test_empty_dict(self, klass): - d1 = klass() - d2 = klass({}) - - self.failUnless(d1 == d2, "d1: %r, d2: %r" % (d1, d2,)) - self.failUnless(len(d1) == 0) - self.failUnless(len(d2) == 0) - - def _help_test_nonempty_dict(self, klass): - d1 = klass({'a': 1, 'b': "eggs", 3: "spam",}) - d2 = klass({'a': 1, 'b': "eggs", 3: "spam",}) - - self.failUnless(d1 == d2) - self.failUnless(len(d1) == 3, "%s, %s" % (len(d1), d1,)) - self.failUnless(len(d2) == 3) - def test_dict_of_sets(self): ds = dictutil.DictOfSets() ds.add(1, "a") From f6e00248bbacdb19b8680ffdc436795e6cc0914e Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 24 Jan 2019 10:23:26 -0500 Subject: [PATCH 4/5] Explicitly select a pyflakes version --- setup.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 84257865e..4c20b432c 100644 --- a/setup.py +++ b/setup.py @@ -256,7 +256,11 @@ setup(name="tahoe-lafs", # also set in __init__.py extras_require={ ':sys_platform=="win32"': ["pypiwin32"], "test": [ - "pyflakes", + # Pin a specific pyflakes so we don't have different folks + # disagreeing on what is or is not a lint issue. We can bump + # this version from time to time, but we will do it + # intentionally. + "pyflakes == 2.1.0", "coverage", "mock", "tox", From 414f84ef3272ddef705f2f135b3afe0602cc46b5 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Thu, 24 Jan 2019 10:37:55 -0500 Subject: [PATCH 5/5] news fragment --- newsfragments/2960.other | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/2960.other diff --git a/newsfragments/2960.other b/newsfragments/2960.other new file mode 100644 index 000000000..2ef00c922 --- /dev/null +++ b/newsfragments/2960.other @@ -0,0 +1 @@ +Several warnings from a new release of pyflakes have been fixed.