summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Charriere <nicholascharriere@gmail.com>2016-11-05 17:39:44 -0700
committerGitHub <noreply@github.com>2016-11-05 17:39:44 -0700
commitb539d9347d6761aa55224ce64fb84dc458450d77 (patch)
tree30ca73dadc50ae7ed3af5ae3844de9ee5b879bb3
parent5a99916bcd2c1bc38145b344dbf6a3f16e23d2d6 (diff)
parentcfda4c5cc063df4a7594aa52673fe03719eccb07 (diff)
downloadpymemcache-b539d9347d6761aa55224ce64fb84dc458450d77.tar.gz
Merge pull request #129 from pinterest/pep8
Pep8
-rw-r--r--pymemcache/client/base.py6
-rw-r--r--pymemcache/test/test_client.py9
-rw-r--r--pymemcache/test/test_client_hash.py3
-rw-r--r--pymemcache/test/test_integration.py3
-rw-r--r--setup.cfg1
5 files changed, 15 insertions, 7 deletions
diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py
index 1d4beb6..2c4baaa 100644
--- a/pymemcache/client/base.py
+++ b/pymemcache/client/base.py
@@ -232,7 +232,8 @@ class Client(object):
def check_key(self, key):
"""Checks key and add key_prefix."""
- return _check_key(key, allow_unicode_keys=self.allow_unicode_keys, key_prefix=self.key_prefix)
+ return _check_key(key, allow_unicode_keys=self.allow_unicode_keys,
+ key_prefix=self.key_prefix)
def _connect(self):
sock = self.socket_module.socket(self.socket_module.AF_INET,
@@ -872,7 +873,8 @@ class PooledClient(object):
def check_key(self, key):
"""Checks key and add key_prefix."""
- return _check_key(key, allow_unicode_keys=self.allow_unicode_keys, key_prefix=self.key_prefix)
+ return _check_key(key, allow_unicode_keys=self.allow_unicode_keys,
+ key_prefix=self.key_prefix)
def _create_client(self):
client = Client(self.server,
diff --git a/pymemcache/test/test_client.py b/pymemcache/test/test_client.py
index ae18c28..ea7b044 100644
--- a/pymemcache/test/test_client.py
+++ b/pymemcache/test/test_client.py
@@ -135,7 +135,8 @@ class ClientTestMixin(object):
def test_set_unicode_char_in_middle_of_key_ok(self):
client = self.make_client([b'STORED\r\n'], allow_unicode_keys=True)
- result = client.set('helloworld_\xb1901520_%c3', b'value', noreply=False)
+ result = client.set('helloworld_\xb1901520_%c3', b'value',
+ noreply=False)
assert result is True
def test_set_noreply(self):
@@ -727,7 +728,8 @@ class TestClient(ClientTestMixin, unittest.TestCase):
self._default_noreply_true('touch', (b'key',), [b'NOT_FOUND\r\n'])
def test_default_noreply_flush_all(self):
- self._default_noreply_false('flush_all', (), [b'__FAKE_RESPONSE__\r\n'])
+ self._default_noreply_false('flush_all', (),
+ [b'__FAKE_RESPONSE__\r\n'])
self._default_noreply_true('flush_all', (), [b'__FAKE_RESPONSE__\r\n'])
def test_version_success(self):
@@ -831,7 +833,8 @@ class TestPooledClient(ClientTestMixin, unittest.TestCase):
self._default_noreply_true('touch', (b'key',), [b'NOT_FOUND\r\n'])
def test_default_noreply_flush_all(self):
- self._default_noreply_false('flush_all', (), [b'__FAKE_RESPONSE__\r\n'])
+ self._default_noreply_false('flush_all', (),
+ [b'__FAKE_RESPONSE__\r\n'])
self._default_noreply_true('flush_all', (), [b'__FAKE_RESPONSE__\r\n'])
diff --git a/pymemcache/test/test_client_hash.py b/pymemcache/test/test_client_hash.py
index f523f4a..0d08b41 100644
--- a/pymemcache/test/test_client_hash.py
+++ b/pymemcache/test/test_client_hash.py
@@ -12,7 +12,8 @@ import socket
class TestHashClient(ClientTestMixin, unittest.TestCase):
- def make_client_pool(self, hostname, mock_socket_values, serializer=None, **kwargs):
+ def make_client_pool(self, hostname, mock_socket_values,
+ serializer=None, **kwargs):
mock_client = Client(hostname, serializer=serializer, **kwargs)
mock_client.sock = MockSocket(mock_socket_values)
client = PooledClient(hostname, serializer=serializer)
diff --git a/pymemcache/test/test_integration.py b/pymemcache/test/test_integration.py
index 32b6b6f..14e9f03 100644
--- a/pymemcache/test/test_integration.py
+++ b/pymemcache/test/test_integration.py
@@ -57,7 +57,8 @@ def test_get_set(client_class, host, port, socket_module):
@pytest.mark.integration()
def test_get_set_unicode_key(client_class, host, port, socket_module):
- client = client_class((host, port), socket_module=socket_module, allow_unicode_keys=True)
+ client = client_class((host, port), socket_module=socket_module,
+ allow_unicode_keys=True)
client.flush_all()
key = u"こんにちは"
diff --git a/setup.cfg b/setup.cfg
index 82d8d51..b57b92b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,6 +24,7 @@ markers =
[flake8]
show-source = True
+max-line-length = 80
[bumpversion:file:pymemcache/__init__.py]