Update to pymemcache 1.2.3

Author: methane

README.rst

@@ -31,6 +31,7 @@ Put kwargs for pymemcache to `PYMEMCACHE` in your Flask configuration.
         'connect_timeout': 1.0,
         'timeout': 0.5,
         'no_delay': True,
+        'key_prefix': b'myapp-',
     }
 
 You can use different config key with `conf_key` keyword::
@@ -44,7 +45,6 @@ You can use different config key with `conf_key` keyword::
 In addition to normal pymemcache kwargs, Flask-PyMemcache provides following
 configuration options.
 
-* `prefix` -- Add prefix to all key. (Default: b'')
 * `close_on_teardown` -- Close connection to memcached when app teardown.
 
 Use

flask_pymemcache.py

@@ -30,6 +30,7 @@
         'connect_timeout': 1.0,
         'timeout': 0.5,
         'no_delay': True,
+        'key_prefix': b'myapp-',
     }
 
 You can use different config key with `conf_key` keyword::
@@ -43,7 +44,6 @@
 In addition to normal pymemcache kwargs, Flask-PyMemcache provides following
 configuration options.
 
-* `prefix` -- Add prefix to all key. (Default: b'')
 * `close_on_teardown` -- Close connection to memcached when app teardown.
 
 Use
@@ -59,18 +59,6 @@
 import pymemcache.client
 
 
-class FlaskMemcacheClient(pymemcache.client.Client):
-    """PyMemcache client supporting prefix"""
-    def __init__(self, prefix=b'', **kwargs):
-        if not isinstance(prefix, bytes):
-            prefix = prefix.encode('ascii')
-        self.prefix = prefix
-        super(FlaskMemcacheClient, self).__init__(**kwargs)
-
-    def check_key(self, key):
-        return super(FlaskMemcacheClient, self).check_key(self.prefix + key)
-
-
 class FlaskPyMemcache(object):
 
     def __init__(self, app=None, conf_key=None):
@@ -94,8 +82,9 @@ def init_app(self, app, conf_key=None):
             raise TypeError("Flask-PyMemcache conf should be dict")
 
         close_on_teardown = conf.pop('close_on_teardown', False)
-        client = FlaskMemcacheClient(**conf)
-        app.extensions[self] = client
+        client = pymemcache.client.Client(**conf)
+        app.extensions.setdefault('pymemcache', {})
+        app.extensions['pymemcache'][self] = client
 
         if close_on_teardown:
             @app.teardown_appcontext
@@ -107,4 +96,4 @@ def client(self):
         """
         :rtype: pymemcache.client.Client
         """
-        return flask.current_app.extensions[self]
+        return flask.current_app.extensions['pymemcache'][self]

setup.py

@@ -11,12 +11,12 @@
 
 setup(
     name="Flask-PyMemcache",
-    version='0.0.3',
+    version='0.0.4',
     py_modules=['flask_pymemcache'],
     author='INADA Naoki',
     author_email='songofacandy at gmail dot com',
     url='https://github.com/KLab/Flask-PyMemcache',
     description="pymemcache integration for Flask",
     long_description=readme,
-    install_requires=["Flask", "pymemcache>=1.2.2", "six"],
+    install_requires=["Flask", "pymemcache>=1.2.3", "six"],
 )

test_flask_pymemcache.py

@@ -12,7 +12,7 @@ def test_simple():
     app = flask.Flask(__name__)
     app.config['PYMEMCACHE'] = {
         'server': ('localhost', 11211),
-        'prefix': b'px'}
+        'key_prefix': b'px'}
     memcache.init_app(app)
 
     with app.app_context():

tox.ini

@@ -2,8 +2,5 @@
 envlist = py27,py33
 
 [testenv]
-install_command = pip install {opts} {packages}
-deps =
-    pymemcache
-    pytest
+deps = pytest
 commands = py.test