src/sage/misc/lazy_import.pyx (clean_namespace): Default for namespac…

…e like lazy_import

src/sage/all.py

@@ -293,7 +293,7 @@ def quit_sage(verbose=True):
 # Relink imported lazy_import objects to point to the appropriate namespace
 
 from sage.misc.lazy_import import clean_namespace
-clean_namespace(globals())
+clean_namespace()
 del clean_namespace
 
 # From now on it is ok to resolve lazy imports

src/sage/misc/lazy_import.pyx

@@ -1195,7 +1195,7 @@ def attributes(a):
             "_at_startup": b._at_startup,
             "_deprecation": b._deprecation}
 
-def clean_namespace(namespace):
+def clean_namespace(namespace=None):
     """
     Adjust :class:`LazyImport` bindings in given namespace to refer to this actual namespace.
 
@@ -1204,6 +1204,11 @@ def clean_namespace(namespace):
     binding in the namespace to the actual imported object upon access is not adjusted.
     This routine fixes that.
 
+    INPUT:
+
+    - ``namespace`` -- the namespace where importing the names; by default,
+      import the names to current namespace
+
     EXAMPLES::
 
         sage: from sage.misc.lazy_import import attributes, clean_namespace
@@ -1219,6 +1224,8 @@ def clean_namespace(namespace):
         True
     """
     cdef LazyImport w
+    if namespace is None:
+        namespace = inspect.currentframe().f_locals
     for k,v in namespace.items():
         if type(v) is LazyImport:
             w = v