diff options
| author | Nicholas Charriere <nicholascharriere@gmail.com> | 2016-10-04 10:36:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-04 10:36:43 -0700 |
| commit | 1920254beaaf2351555009056addfe5e0201d1eb (patch) | |
| tree | 5c0b14b3e1b5502c41fa8027dd60c3a62a39a365 | |
| parent | 8f5f1226a0b905e943cae3113873914a397a7c73 (diff) | |
| parent | d650c3d8cb249e64518c399133cb9a5dc5cd6919 (diff) | |
| download | pymemcache-1920254beaaf2351555009056addfe5e0201d1eb.tar.gz | |
Merge pull request #120 from pinterest/pre-release-137
Final touches for 1.3.7
| -rw-r--r-- | ChangeLog.rst | 11 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | pymemcache/client/base.py | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog.rst b/ChangeLog.rst index d22bc68..e3cbab2 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,5 +1,16 @@ Change Log ========== +New in version 1.3.7 +-------------------- +* default parameter on get(key, default=0) +* fixed docs to autogenerate themselves with sphinx +* fix linter to work with python3 +* improve error message on illegal Input for the key +* refactor stat parsing +* fix MockMemcacheClient +* fix unicode char in middle of key bug +* use cpickle instead of pickle when possible (python2) + New in version 1.3.6 -------------------- * Fix flake8 and cleanup tox building diff --git a/docs/conf.py b/docs/conf.py index cc2f9d2..1a95bdc 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -66,7 +66,7 @@ author = u'Charles Gordon, Nicholas Charriere' # The short X.Y version. version = u'1.3' # The full version, including alpha/beta/rc tags. -release = u'1.3.6' +release = u'1.3.7' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/pymemcache/client/base.py b/pymemcache/client/base.py index 515e456..d62dd80 100644 --- a/pymemcache/client/base.py +++ b/pymemcache/client/base.py @@ -36,6 +36,7 @@ VALID_STORE_RESULTS = { b'prepend': (b'STORED', b'NOT_STORED'), b'cas': (b'STORED', b'EXISTS', b'NOT_FOUND'), } +VALID_STRING_TYPES = (six.text_type, six.string_types) # Some of the values returned by the "stats" command @@ -82,8 +83,7 @@ STAT_TYPES = { def _check_key(key, key_prefix=b''): """Checks key and add key_prefix.""" - allowed_str_types = (six.text_type, six.string_types) - if isinstance(key, allowed_str_types): + if isinstance(key, VALID_STRING_TYPES): try: key = key.encode('ascii') except (UnicodeEncodeError, UnicodeDecodeError): |