diff options
| -rw-r--r-- | pymemcache/client.py | 9 | ||||
| -rw-r--r-- | pymemcache/fallback.py | 1 | ||||
| -rw-r--r-- | pymemcache/serde.py | 9 | ||||
| -rw-r--r-- | setup.cfg | 4 | ||||
| -rw-r--r-- | setup.py | 27 | ||||
| -rw-r--r-- | tox.ini | 8 |
6 files changed, 35 insertions, 23 deletions
diff --git a/pymemcache/client.py b/pymemcache/client.py index 3a09639..9b5ae2c 100644 --- a/pymemcache/client.py +++ b/pymemcache/client.py @@ -128,9 +128,9 @@ class Client(object): strings must be encoded (as UTF-8, for example) unless they consist only of ASCII characters that are neither whitespace nor control characters. - Values must have a __str__() method to convert themselves to a byte string. - Unicode objects can be a problem since str() on a Unicode object will - attempt to encode it as ASCII (which will fail if the value contains + Values must have a __str__() method to convert themselves to a byte + string. Unicode objects can be a problem since str() on a Unicode object + will attempt to encode it as ASCII (which will fail if the value contains code points larger than U+127). You can fix this will a serializer or by just calling encode on the string (using UTF-8, for instance). @@ -602,7 +602,8 @@ class Client(object): Args: delay: optional int, the number of seconds to wait before flushing, or zero to flush immediately (the default). - noreply: optional bool, True to not wait for the response (the default). + noreply: optional bool, True to not wait for the response + (the default). Returns: True. diff --git a/pymemcache/fallback.py b/pymemcache/fallback.py index 6eed4f5..d70d83c 100644 --- a/pymemcache/fallback.py +++ b/pymemcache/fallback.py @@ -42,6 +42,7 @@ Best Practices: old cluster before you switch away from FallbackClient. """ + class FallbackClient(object): def __init__(self, caches): assert len(caches) > 0 diff --git a/pymemcache/serde.py b/pymemcache/serde.py index 0b654b6..c7a00ee 100644 --- a/pymemcache/serde.py +++ b/pymemcache/serde.py @@ -21,9 +21,9 @@ except ImportError: from StringIO import StringIO -FLAG_PICKLE = 1<<0 -FLAG_INTEGER = 1<<1 -FLAG_LONG = 1<<2 +FLAG_PICKLE = 1 << 0 +FLAG_INTEGER = 1 << 1 +FLAG_LONG = 1 << 2 def python_memcache_serializer(key, value): @@ -46,6 +46,7 @@ def python_memcache_serializer(key, value): return value, flags + def python_memcache_deserializer(key, value, flags): if flags == 0: return value @@ -61,7 +62,7 @@ def python_memcache_deserializer(key, value, flags): buf = StringIO(value) unpickler = pickle.Unpickler(buf) return unpickler.load() - except Exception as e: + except Exception: logging.info('Pickle error', exc_info=True) return None @@ -1,2 +1,6 @@ [wheel] universal = true + +[flake8] +exclude = pymemcache/test/ +show-source = True @@ -5,19 +5,19 @@ from setuptools import setup, find_packages from pymemcache import __version__ setup( - name = 'pymemcache', - version = __version__, - author = 'Charles Gordon', - author_email = 'charles@pinterest.com', - packages = find_packages(), - tests_require = ['nose>=1.0'], - test_suite = 'nose.collector', - install_requires = ['six'], - description = 'A comprehensive, fast, pure Python memcached client', - long_description = open('README.md').read(), - license = 'Apache License 2.0', - url = 'https://github.com/Pinterest/pymemcache', - classifiers = [ + name='pymemcache', + version=__version__, + author='Charles Gordon', + author_email='charles@pinterest.com', + packages=find_packages(), + tests_require=['nose>=1.0'], + test_suite='nose.collector', + install_requires=['six'], + description='A comprehensive, fast, pure Python memcached client', + long_description=open('README.md').read(), + license='Apache License 2.0', + url='https://github.com/Pinterest/pymemcache', + classifiers=[ 'Programming Language :: Python', 'Programming Language :: Python :: 2.6', 'Programming Language :: Python :: 2.7', @@ -26,4 +26,3 @@ setup( 'Topic :: Database', ], ) - @@ -1,11 +1,17 @@ [tox] -envlist = py26, py27, pypy, py33, py34 +envlist = py26, py27, pypy, py33, py34, flake8 [testenv] deps = nose commands = python setup.py nosetests +[testenv:flake8] +commands = + pip install flake8 + flake8 . + + [testenv:docs] commands = pip install -r docs-requirements.txt |