diff --git a/0001-Link-moved-functions-in-dogpile.cache.util.patch b/0001-Link-moved-functions-in-dogpile.cache.util.patch deleted file mode 100644 index 8566f13..0000000 --- a/0001-Link-moved-functions-in-dogpile.cache.util.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 85dd3797d5abeea16ba7636796e07338878fba10 Mon Sep 17 00:00:00 2001 -From: Jamie Lennox -Date: Thu, 9 Jun 2016 09:50:43 -0400 -Subject: [PATCH] Link moved functions in dogpile.cache.util - -Change-Id: I5819a237d6abe7c2ee5e04abeedc06ff229388a8 -Pull-request: https://bitbucket.org/zzzeek/dogpile.cache/pull-requests/51 ---- - docs/build/changelog.rst | 11 +++++++++++ - dogpile/cache/util.py | 8 ++++++++ - 2 files changed, 19 insertions(+) - -Index: dogpile.cache-0.6.1/docs/build/changelog.rst -=================================================================== ---- dogpile.cache-0.6.1.orig/docs/build/changelog.rst -+++ dogpile.cache-0.6.1/docs/build/changelog.rst -@@ -13,6 +13,17 @@ Changelog - and ``NameRegistry`` into the base namespace, in addition to - ``dogpile.core.nameregistry`` and ``dogpile.core.readwrite_lock``. - -+ .. change:: -+ :tags: bug -+ -+ Restored some more util symbols that users may have been relying upon -+ (although these were not necessarily intended as user-facing): -+ ``dogpile.cache.util.coerce_string_conf``, -+ ``dogpile.cache.util.KeyReentrantMutex``, -+ ``dogpile.cache.util.memoized_property``, -+ ``dogpile.cache.util.PluginLoader``, -+ ``dogpile.cache.util.to_list``. -+ - .. changelog:: - :version: 0.6.0 - :released: Mon Jun 6 2016 -Index: dogpile.cache-0.6.1/dogpile/cache/util.py -=================================================================== ---- dogpile.cache-0.6.1.orig/dogpile/cache/util.py -+++ dogpile.cache-0.6.1/dogpile/cache/util.py -@@ -1,6 +1,7 @@ - from hashlib import sha1 - import inspect - from ..util import compat -+from ..util import langhelpers - - - def function_key_generator(namespace, fn, to_str=compat.string_type): -@@ -75,4 +76,11 @@ def length_conditional_mangler(length, m - return key - return mangle - -+# in the 0.6 release these functions were moved to the dogpile.util namespace. -+# They are linked here to maintain compatibility with older versions. - -+coerce_string_conf = langhelpers.coerce_string_conf -+KeyReentrantMutex = langhelpers.KeyReentrantMutex -+memoized_property = langhelpers.memoized_property -+PluginLoader = langhelpers.PluginLoader -+to_list = langhelpers.to_list