Version bump. Moved CacheProperties to utils module

juggling/__init__.py

@@ -1,5 +1,5 @@
 import logging
 
-__version__ = '0.1.3'
+__version__ = '0.1.4'
 
 logger = logging.getLogger(__name__)

juggling/pattern/__init__.py

@@ -8,6 +8,8 @@
     # Python2
     from UserList import UserList  # noqa
 
+from .utils import CacheProperties
+
 
 __all__ = ['Pattern']
 
@@ -108,37 +110,6 @@ def generate_state(pattern, starting_throw=0):
     return state
 
 
-class CacheProperties(object):
-    """ Will automatically cache property attributes of itself. Can clear with self._clear_cache() """
-    _cache_exclude = []
-
-    def __init__(self, *args, **kwargs):  # noqa
-        self._cache = {}
-        super(CacheProperties, self).__init__()
-
-    def _clear_cache(self):
-        try:
-            self._cache.clear()
-        except AttributeError:
-            pass  # means _cache hasn't been set yet
-
-    def __setattr__(self, key, value):
-        if key != '_cache' and key in self._cache:
-            del self._cache[key]
-        super(CacheProperties, self).__setattr__(key, value)
-
-    def __getattribute__(self, name, *args, **kwargs):
-        exclude_attrs = super(CacheProperties, self).__getattribute__('_cache_exclude')
-        if (not name.startswith('__') and
-                name not in ['_cache', '_cached_attrs', '_clear_cache'] + exclude_attrs and
-                isinstance(getattr(self.__class__, name, None), property)):
-            cache = super(CacheProperties, self).__getattribute__('_cache')
-            if name not in cache:
-                cache[name] = super(CacheProperties, self).__getattribute__(name)
-            return cache[name]
-        return super(CacheProperties, self).__getattribute__(name, *args, **kwargs)
-
-
 class Pattern(CacheProperties, UserList):
     """
     The base representation of any juggling pattern, regardless of notation. A :class:`Pattern` looks

juggling/pattern/utils.py

@@ -0,0 +1,29 @@
+class CacheProperties(object):
+    """ Will automatically cache property attributes of itself. Can clear with self._clear_cache() """
+    _cache_exclude = []
+
+    def __init__(self, *args, **kwargs):  # noqa
+        self._cache = {}
+        super(CacheProperties, self).__init__()
+
+    def _clear_cache(self):
+        try:
+            self._cache.clear()
+        except AttributeError:
+            pass  # means _cache hasn't been set yet
+
+    def __setattr__(self, key, value):
+        if key != '_cache' and key in self._cache:
+            del self._cache[key]
+        super(CacheProperties, self).__setattr__(key, value)
+
+    def __getattribute__(self, name, *args, **kwargs):
+        exclude_attrs = super(CacheProperties, self).__getattribute__('_cache_exclude')
+        if (not name.startswith('__') and
+                name not in ['_cache', '_cached_attrs', '_clear_cache'] + exclude_attrs and
+                isinstance(getattr(self.__class__, name, None), property)):
+            cache = super(CacheProperties, self).__getattribute__('_cache')
+            if name not in cache:
+                cache[name] = super(CacheProperties, self).__getattribute__(name)
+            return cache[name]
+        return super(CacheProperties, self).__getattribute__(name, *args, **kwargs)