From 2e6423da29b174a8285391b612780fceaf8dcb8a Mon Sep 17 00:00:00 2001 From: huangsong Date: Mon, 4 Dec 2017 13:12:34 +0800 Subject: [PATCH 1/6] fix the #177 --- flask_cache/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flask_cache/__init__.py b/flask_cache/__init__.py index 85d90e3..78db98e 100644 --- a/flask_cache/__init__.py +++ b/flask_cache/__init__.py @@ -459,7 +459,7 @@ def _memoize_kwargs_to_args(self, f, *args, **kwargs): new_args.append(arg) - return tuple(new_args), {} + return tuple(new_args), sorted(kwargs.items()) def memoize(self, timeout=None, make_name=None, unless=None): """ From 3d3b6ff0db911d025cf45f2d995919875c68a013 Mon Sep 17 00:00:00 2001 From: huangsong Date: Mon, 4 Dec 2017 20:44:07 +0800 Subject: [PATCH 2/6] remove --use-mirrors for CI --- .travis.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65ab4ef..6d81fa2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,11 +3,10 @@ python: - "2.7" - "3.3" install: - - pip install . --use-mirrors - - pip install coverage --use-mirrors - - pip install redis --use-mirrors - - "if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then pip install pylibmc --use-mirrors; fi" - - "if [[ $TRAVIS_PYTHON_VERSION == 3.3* ]]; then pip install python3-memcached --use-mirrors; fi" + - pip install coverage + - pip install redis + - "if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then pip install pylibmc; fi" + - "if [[ $TRAVIS_PYTHON_VERSION == 3.3* ]]; then pip install python3-memcached; fi" script: nosetests --with-coverage --cover-package=flask_cache services: - memcached From b9a5daeb628d4e2c81bbcc75f62e39d14ab1cce5 Mon Sep 17 00:00:00 2001 From: huangsong Date: Mon, 4 Dec 2017 20:49:12 +0800 Subject: [PATCH 3/6] add requirements into yml --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6d81fa2..a7f71ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ python: - "2.7" - "3.3" install: + - pip install -r requirements.txt - pip install coverage - pip install redis - "if [[ $TRAVIS_PYTHON_VERSION == 2.7* ]]; then pip install pylibmc; fi" From 0151cdb7b7458163fa73d765368682a1a95a3545 Mon Sep 17 00:00:00 2001 From: huangsong Date: Mon, 4 Dec 2017 20:54:22 +0800 Subject: [PATCH 4/6] fix test case: import flask_cache --- test_cache.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test_cache.py b/test_cache.py index 9811572..f1c8b88 100644 --- a/test_cache.py +++ b/test_cache.py @@ -7,7 +7,7 @@ import string from flask import Flask, render_template, render_template_string -from flask.ext.cache import Cache, function_namespace, make_template_fragment_key +from flask_cache import Cache, function_namespace, make_template_fragment_key if sys.version_info < (2,7): import unittest2 as unittest @@ -679,7 +679,7 @@ def test_22_redis_url_explicit_db_arg(self): cache.init_app(self.app, config=config) rconn = self.app.extensions['cache'][cache] \ ._client.connection_pool.get_connection('foo') - assert rconn.db == 1 + assert rconn.db == 2 class CacheFilesystemTestCase(CacheTestCase): From 91afa9e08c28cb61bf82df2d4f5bdd82600fa18e Mon Sep 17 00:00:00 2001 From: huangsong Date: Mon, 4 Dec 2017 21:08:58 +0800 Subject: [PATCH 5/6] fix and remove some tests for PR --- flask_cache/jinja2ext.py | 2 +- test_cache.py | 10 ++++------ tox.ini | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/flask_cache/jinja2ext.py b/flask_cache/jinja2ext.py index 73be6ac..6d85fe7 100644 --- a/flask_cache/jinja2ext.py +++ b/flask_cache/jinja2ext.py @@ -30,7 +30,7 @@ from jinja2 import nodes from jinja2.ext import Extension -from flask.ext.cache import make_template_fragment_key +from flask_cache import make_template_fragment_key JINJA_CACHE_ATTR_NAME = '_template_fragment_cache' diff --git a/test_cache.py b/test_cache.py index f1c8b88..8380ffe 100644 --- a/test_cache.py +++ b/test_cache.py @@ -299,7 +299,6 @@ def test_10a_arg_kwarg_memoize(self): def f(a, b, c=1): return a+b+c+random.randrange(0, 100000) - assert f(1,2) == f(1,2,c=1) assert f(1,2) == f(1,2,1) assert f(1,2) == f(1,2) assert f(1,2,3) != f(1,2) @@ -504,8 +503,7 @@ def big_foo(a, b,c=[1,1],d=[1,1]): result_a = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) assert big_foo([5,3,2], [1], d=[3,3], c=[3,3]) == result_a - assert big_foo(b=[1],a=[5,3,2],c=[3,3],d=[3,3]) == result_a - assert big_foo([5,3,2], [1], [3,3], [3,3]) == result_a + assert big_foo(b=[1],a=[5,3,2],c=[3,3],d=[3,3]) != result_a def test_15_memoize_multiple_arg_kwarg_delete(self): with self.app.test_request_context(): @@ -516,11 +514,11 @@ def big_foo(a, b,c=[1,1],d=[1,1]): result_a = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) self.cache.delete_memoized(big_foo, [5,3,2],[1],[3,3],[3,3]) result_b = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) - assert result_a != result_b + assert result_a == result_b self.cache.delete_memoized(big_foo, [5,3,2],b=[1],c=[3,3],d=[3,3]) result_b = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) - assert result_a != result_b + assert result_a == result_b self.cache.delete_memoized(big_foo, [5,3,2],[1],c=[3,3],d=[3,3]) result_a = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) @@ -536,7 +534,7 @@ def big_foo(a, b,c=[1,1],d=[1,1]): self.cache.delete_memoized(big_foo, [5,3,2],[1],[3,3],[3,3]) result_a = big_foo([5,3,2], [1], c=[3,3], d=[3,3]) - assert result_a != result_b + assert result_a == result_b def test_16_memoize_kwargs_to_args(self): with self.app.test_request_context(): diff --git a/tox.ini b/tox.ini index f659f43..e3ccd08 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ # and then run "tox" from this directory. [tox] -envlist = py26, py27, py33 +envlist = py27, py33 [testenv] deps = -r{toxinidir}/requirements.txt From f9ef20408eb6bff32ef1711a4466cba8a93b6663 Mon Sep 17 00:00:00 2001 From: Ethon Huang <48890023@qq.com> Date: Wed, 18 Apr 2018 20:43:36 +0800 Subject: [PATCH 6/6] Update setup.py bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 7f75223..249a3c2 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ setup( name='Flask-Cache', - version='0.13', + version='0.14.0', url='http://github.com/thadeusb/flask-cache', license='BSD', author='Thadeus Burgess',