Replace memoize_default with two nicer functions.

jedi/evaluate/cache.py

@@ -1,15 +1,15 @@
 """
-- the popular ``memoize_default`` works like a typical memoize and returns the
+- the popular ``_memoize_default`` works like a typical memoize and returns the
   default otherwise.
-- ``CachedMetaClass`` uses ``memoize_default`` to do the same with classes.
+- ``CachedMetaClass`` uses ``_memoize_default`` to do the same with classes.
 """
 
 import inspect
 
-NO_DEFAULT = object()
+_NO_DEFAULT = object()
 
 
-def memoize_default(default=NO_DEFAULT, evaluator_is_first_arg=False, second_arg_is_evaluator=False):
+def _memoize_default(default=_NO_DEFAULT, evaluator_is_first_arg=False, second_arg_is_evaluator=False):
     """ This is a typical memoization decorator, BUT there is one difference:
     To prevent recursion it sets defaults.
 
@@ -36,7 +36,7 @@ def memoize_default(default=NO_DEFAULT, evaluator_is_first_arg=False, second_arg
             if key in memo:
                 return memo[key]
             else:
-                if default is not NO_DEFAULT:
+                if default is not _NO_DEFAULT:
                     memo[key] = default
                 rv = function(obj, *args, **kwargs)
                 if inspect.isgenerator(rv):
@@ -47,16 +47,16 @@ def memoize_default(default=NO_DEFAULT, evaluator_is_first_arg=False, second_arg
     return func
 
 
-def evaluator_function_cache(default=NO_DEFAULT):
+def evaluator_function_cache(default=_NO_DEFAULT):
     def decorator(func):
-        return memoize_default(default=default, evaluator_is_first_arg=True)(func)
+        return _memoize_default(default=default, evaluator_is_first_arg=True)(func)
 
     return decorator
 
 
-def evaluator_method_cache(default=NO_DEFAULT):
+def evaluator_method_cache(default=_NO_DEFAULT):
     def decorator(func):
-        return memoize_default(default=default)(func)
+        return _memoize_default(default=default)(func)
 
     return decorator
 
@@ -67,6 +67,6 @@ class CachedMetaClass(type):
     class initializations. Either you do it this way or with decorators, but
     with decorators you lose class access (isinstance, etc).
     """
-    @memoize_default(None, second_arg_is_evaluator=True)
+    @_memoize_default(None, second_arg_is_evaluator=True)
     def __call__(self, *args, **kwargs):
         return super(CachedMetaClass, self).__call__(*args, **kwargs)