summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Gordon <jogo@pinterest.com>2017-11-27 11:47:39 -0800
committerJoe Gordon <jogo@pinterest.com>2017-11-27 13:18:20 -0800
commit3a92820576f67fc175f175d82b04c9afcce42300 (patch)
treeab36f574efdce2d50084cf510880b2d40982508f
parent2b75292d6026978dd5af924b5640a23793741121 (diff)
downloadpymemcache-3a92820576f67fc175f175d82b04c9afcce42300.tar.gz
Fix flake8 issues
We previously weren't running flake8 on travis so a few issues got in.
-rw-r--r--pymemcache/client/hash.py2
-rw-r--r--pymemcache/test/test_utils.py8
2 files changed, 5 insertions, 5 deletions
diff --git a/pymemcache/client/hash.py b/pymemcache/client/hash.py
index 7766aaa..9aa95ac 100644
--- a/pymemcache/client/hash.py
+++ b/pymemcache/client/hash.py
@@ -206,7 +206,7 @@ class HashClient(object):
raise
return default_val
- except:
+ except Exception:
# any exceptions that aren't socket.error we need to handle
# gracefully as well
if not self.ignore_exc:
diff --git a/pymemcache/test/test_utils.py b/pymemcache/test/test_utils.py
index 95dc7e9..6c6ea85 100644
--- a/pymemcache/test/test_utils.py
+++ b/pymemcache/test/test_utils.py
@@ -34,9 +34,9 @@ def test_get_many_set_many():
# Convert keys into bytes
d = dict((k.encode('ascii'), v)
- for k, v in six.iteritems(dict(h=1, e=2, l=3)))
+ for k, v in six.iteritems(dict(h=1, e=2, z=3)))
client.set_many(d)
- assert client.get_many([b"h", b"e", b"l", b"o"]) == d
+ assert client.get_many([b"h", b"e", b"z", b"o"]) == d
@pytest.mark.unit()
@@ -55,10 +55,10 @@ def test_get_many_set_many_non_ascii_values():
# Convert keys into bytes
d = dict((k.encode('ascii'), v)
for k, v in six.iteritems(
- dict(h=non_ascii_1, e=non_ascii_2, l=non_ascii_3)
+ dict(h=non_ascii_1, e=non_ascii_2, z=non_ascii_3)
))
client.set_many(d)
- assert client.get_many([b"h", b"e", b"l", b"o"]) == d
+ assert client.get_many([b"h", b"e", b"z", b"o"]) == d
@pytest.mark.unit()