fix bugs

Author: lonelyenvoy

README.md

@@ -2,7 +2,7 @@
 
 [![Version][aucsvg]][auc] [![Supports Python][pythonsvg]][python] [![Build Status][travismaster]][travis] [![Repository][repositorysvg]][repository] [![License][licensesvg]][license]
 
-[aucsvg]: https://img.shields.io/badge/memoization-v0.0.9-brightgreen.svg
+[aucsvg]: https://img.shields.io/badge/memoization-v0.0.10-brightgreen.svg
 [auc]: https://github.com/lonelyenvoy/python-memoization
 
 [pythonsvg]: https://img.shields.io/badge/python-2.6,_2.7,_3.2,_3.3,_3.4,_3.5,_3.6,_3.7-brightgreen.svg

memoization/_undecorated.py

@@ -5,9 +5,8 @@
 import time
 from functools import wraps
 from functools import reduce
-from _undecorated import include_undecorated_function
 
-__version__ = '0.0.9'
+__version__ = '0.0.10'
 _cache = {}
 
 
@@ -22,7 +21,7 @@ def cached(max_items=None, ttl=None):
                 If not given, the data in cache is valid forever.
     :return: decorator
     """
-    @include_undecorated_function()
+    @_include_undecorated_function()
     def decorator(func):
         """
         @cached decorator.
@@ -189,6 +188,38 @@ def _retrieve_safe_function_id(func):
     return function_id
 
 
+def _include_undecorated_function(key='original'):
+    """
+    Decorator to include original function in a decorated one
+
+    e.g.
+    @include_undecorated_function()
+    def shout(f):
+        def _():
+            string = f()
+            return string.upper()
+        return _
+
+
+    @shout
+    def hello():
+        return 'hello world'
+
+    print hello()               # HELLO WORLD
+    print hello.original()      # hello world
+
+    :param key: The key to access the original function
+    :return: decorator
+    """
+    def this_decorator(decorator):
+        def wrapper(func):
+            decorated = decorator(func)
+            setattr(decorated, key, func)
+            return decorated
+        return wrapper
+    return this_decorator
+
+
 if __name__ == '__main__':
     import sys
     sys.stderr.write('python-memoization v' + __version__ +

memoization/memoization.py

@@ -1,14 +1,15 @@
 from setuptools import setup, find_packages
 
 setup(name='memoization',
-      version='0.0.9',
+      version='0.0.10',
       description='A minimalist functional caching lib for Python, with TTL and auto memory management support. '
                   '(https://github.com/lonelyenvoy/python-memoization)',
       keywords='memoization memorization remember decorator cache caching function callable'
                'functional ttl limited capacity fast high-performance optimization',
       url='https://github.com/lonelyenvoy/python-memoization',
       author='lonelyenvoy',
       author_email='[email protected]',
+      py_modules=['memoization'],
       license='MIT',
       packages=find_packages(),
       exclude_package_data={'': ['examples.py', 'test.py']})