Use user_globals instead of Cython's old_style_globals

jdemeyer · jdemeyer · commit 9ccd889321d3 · 2015-03-30T17:05:27.000+02:00
diff --git a/src/sage/calculus/var.pyx b/src/sage/calculus/var.pyx
@@ -1,5 +1,18 @@
+"""
+Symbolic variables
+"""
+
+#*****************************************************************************
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#                  http://www.gnu.org/licenses/
+#*****************************************************************************
+
 from sage.symbolic.function_factory import function as new_function
 from sage.symbolic.ring import SR
+from sage.repl.user_globals import set_global, get_globals
 
 def var(*args, **kwds):
     r"""
@@ -109,40 +122,17 @@ def var(*args, **kwds):
         <type 'sage.symbolic.expression.Expression'>
         sage: parent(theta)
         Symbolic Ring
-
-    TESTS::
-
-        sage: var('q',ns=False)
-        Traceback (most recent call last):
-        ...
-        NotImplementedError: The new (Pynac) symbolics are now the only symbolics; please do not use keyword `ns` any longer.
-        sage: q
-        Traceback (most recent call last):
-        ...
-        NameError: name 'q' is not defined
-        sage: var('q',ns=1)
-        doctest:...: DeprecationWarning: The new (Pynac) symbolics are now the only symbolics; please do not use keyword 'ns' any longer.
-        See http://trac.sagemath.org/6559 for details.
-        q
     """
     if len(args)==1:
         name = args[0]
     else:
         name = args
-    G = globals()  # this is the reason the code must be in Cython.
-    if 'ns' in kwds:
-        if kwds['ns']:
-            from sage.misc.superseded import deprecation
-            deprecation(6559, "The new (Pynac) symbolics are now the only symbolics; please do not use keyword 'ns' any longer.")
-        else:
-            raise NotImplementedError("The new (Pynac) symbolics are now the only symbolics; please do not use keyword `ns` any longer.")
-        kwds.pop('ns')
     v = SR.var(name, **kwds)
     if isinstance(v, tuple):
         for x in v:
-            G[repr(x)] = x
+            set_global(repr(x), x)
     else:
-        G[repr(v)] = v
+        set_global(repr(v), v)
     return v
 
 def function(s, *args, **kwds):
@@ -226,13 +216,12 @@ def function(s, *args, **kwds):
     if len(args) > 0:
         return function(s, **kwds)(*args)
 
-    G = globals()  # this is the reason the code must be in Cython.
     v = new_function(s, **kwds)
     if isinstance(v, tuple):
         for x in v:
-            G[repr(x)] = x
+            set_global(repr(x), x)
     else:
-        G[repr(v)] = v
+        set_global(repr(v), v)
     return v
 
 
@@ -259,7 +248,7 @@ def clear_vars():
         sage: k
         15
     """
-    G = globals()
+    G = get_globals()
     from sage.symbolic.ring import is_SymbolicVariable
     for i in range(65,65+26) + range(97,97+26):
         if chr(i) in G and is_SymbolicVariable(G[chr(i)]):
@@ -271,6 +260,3 @@ def clear_vars():
                 G[chr(i)].pyobject()
             except TypeError:
                 del G[chr(i)]
-
-
-
diff --git a/src/sage/combinat/ncsf_qsym/tutorial.py b/src/sage/combinat/ncsf_qsym/tutorial.py
@@ -141,7 +141,7 @@
 means the partition obtained by sorting the composition `c`::
 
     sage: SymmetricFunctions(QQ).inject_shorthands()
-    doctest:...: RuntimeWarning: redefining global value `e`
+    doctest:...: RuntimeWarning: redefining global value 'e'
     sage: m[2,1]
     m[2, 1]
     sage: M(m[2,1])
diff --git a/src/sage/combinat/quickref.py b/src/sage/combinat/quickref.py
@@ -60,7 +60,7 @@
 
     sage: Sym = SymmetricFunctions(QQ); Sym.inject_shorthands()
     ...
-    doctest:...: RuntimeWarning: redefining global value `e`
+    doctest:...: RuntimeWarning: redefining global value 'e'
     sage: m( ( h[2,1] * (1 + 3 * p[2,1]) ) + s[2](s[3]) )
     3*m[1, 1, 1] + ... + 10*m[5, 1] + 4*m[6]
 
diff --git a/src/sage/combinat/sf/sf.py b/src/sage/combinat/sf/sf.py
@@ -185,11 +185,11 @@ class SymmetricFunctions(UniqueRepresentation, Parent):
     ::
 
         sage: Sym.inject_shorthands()
-        doctest:...: RuntimeWarning: redefining global value `h`
-        doctest:...: RuntimeWarning: redefining global value `s`
-        doctest:...: RuntimeWarning: redefining global value `e`
-        doctest:...: RuntimeWarning: redefining global value `m`
-        doctest:...: RuntimeWarning: redefining global value `p`
+        doctest:...: RuntimeWarning: redefining global value 'h'
+        doctest:...: RuntimeWarning: redefining global value 's'
+        doctest:...: RuntimeWarning: redefining global value 'e'
+        doctest:...: RuntimeWarning: redefining global value 'm'
+        doctest:...: RuntimeWarning: redefining global value 'p'
 
     We can then do conversions from one basis to another::
 
diff --git a/src/sage/ext/interactive_constructors_c.pyx b/src/sage/ext/interactive_constructors_c.pyx
@@ -2,6 +2,7 @@
 # inject variables into the global module scope.
 
 import sage.rings.all
+import sage.repl.user_globals
 
 _verbose=True
 _inject_mode_off = False
@@ -66,15 +67,15 @@ def inject_on(verbose=True):
     global _original_constructors
     _original_constructors = {}
     import sage.ext.interactive_constructors_c
-    G = globals()
+    G = sage.repl.user_globals.get_globals()
     if verbose:
         print "Redefining:",
     for X in sorted(sage.ext.interactive_constructors_c.__dict__.keys()):
         if not 'inject' in X and X[0] != '_' and X[:4] != 'sage':
             if verbose:
                 print X,
             try:
-                _original_constructors[X] =  G[X] #sage.ext.interactive_constructors_c.__dict__[X]
+                _original_constructors[X] = G[X]
             except KeyError:
                 pass
             G[X] = sage.ext.interactive_constructors_c.__dict__[X]
@@ -84,8 +85,8 @@ def inject_on(verbose=True):
 def inject_off():
     global _original_constructors
     if not _original_constructors is None:
-        for X in _original_constructors.keys():
-            globals()[X] = _original_constructors[X]
+        for X in _original_constructors:
+            sage.repl.user_globals.set_global(X, _original_constructors[X])
 
 cdef _inject(X, do):
     if do:
diff --git a/src/sage/misc/citation.pyx b/src/sage/misc/citation.pyx
@@ -1,5 +1,6 @@
 from sage.misc.all import tmp_filename
 from sage.env import SAGE_ROOT
+from sage.repl.user_globals import get_globals
 
 systems = {}
 systems['PARI'] = ['sage.libs.pari', 'sage.interfaces.gp']
@@ -79,7 +80,7 @@ def get_systems(cmd):
 
     #Run the command and get the stats
     filename = tmp_filename()
-    cProfile.runctx(cmd, globals(), {}, filename)
+    cProfile.runctx(cmd, get_globals(), {}, filename)
     stats = pstats.Stats(filename)
 
     #Strings is a list of method names and modules which get run
diff --git a/src/sage/misc/cython_c.pyx b/src/sage/misc/cython_c.pyx
@@ -57,8 +57,10 @@ def cython(code,
         compiled once.
     """
     tmpfile = sage.misc.temporary_file.tmp_filename(ext=".spyx")
-    open(tmpfile,'w').write(code)
-    sage.server.support.cython_import_all(tmpfile, globals(),
+    with open(tmpfile, 'w') as f:
+        f.write(code)
+    from sage.repl.user_globals import get_globals
+    sage.server.support.cython_import_all(tmpfile, get_globals(),
                                          verbose=verbose, compile_message=compile_message,
                                          use_cache=use_cache,
                                          create_local_c_file=False)
diff --git a/src/sage/misc/dev_tools.py b/src/sage/misc/dev_tools.py
@@ -76,10 +76,10 @@ def runsnake(command):
     """
     import cProfile, os
     from sage.misc.temporary_file import tmp_filename
-    from sage.misc.misc import get_main_globals
+    from sage.repl.user_globals import get_globals
     from sage.repl.preparse import preparse
     tmpfile = tmp_filename()
-    cProfile.runctx(preparse(command.lstrip().rstrip()), get_main_globals(), locals(), filename=tmpfile)
+    cProfile.runctx(preparse(command.lstrip().rstrip()), get_globals(), locals(), filename=tmpfile)
     os.system("/usr/bin/python -E `which runsnake` %s &"%tmpfile)
 
 def import_statement_string(module, names, lazy):
diff --git a/src/sage/misc/fpickle.pyx b/src/sage/misc/fpickle.pyx
@@ -68,9 +68,9 @@ def unpickle_function(pickled):
         sage: unpickle_function(pickle_function(f))(3,5)
         15
     """
+    from sage.repl.user_globals import get_globals
     recovered = cPickle.loads(pickled)
-    return types.FunctionType(recovered, globals())
-
+    return types.FunctionType(recovered, get_globals())
 
 
 def call_pickled_function(fpargs):
diff --git a/src/sage/misc/misc.py b/src/sage/misc/misc.py
@@ -2315,6 +2315,8 @@ def get_main_globals():
 
         sage: from sage.misc.misc import get_main_globals
         sage: G = get_main_globals()
+        doctest:...: DeprecationWarning: get_main_globals is deprecated, use sage.repl.user_globals.get_globals() instead
+        See http://trac.sagemath.org/18083 for details.
         sage: bla = 1
         sage: G['bla']
         1
@@ -2334,29 +2336,15 @@ def get_main_globals():
         ....:     G['blo'] = 42
         sage: bli = 14
         sage: f()
+        doctest:...: DeprecationWarning: get_main_globals is deprecated, use sage.repl.user_globals.get_globals() instead
+        See http://trac.sagemath.org/18083 for details.
         sage: blo
         42
-
-    ALGORITHM:
-
-    The main global namespace is discovered by going up the frame
-    stack until the frame for the :mod:`__main__` module is found.
-    Should this frame not be found (this should not occur in normal
-    operation), an exception "ValueError: call stack is not deep
-    enough" will be raised by ``_getframe``.
-
-    See :meth:`inject_variable_test` for a real test that this works
-    within deeply nested calls in a function defined in a Python
-    module.
     """
-    import sys
-    depth = 0
-    while True:
-        G = sys._getframe(depth).f_globals
-        if G.get("__name__", None) == "__main__":
-            break
-        depth += 1
-    return G
+    from sage.misc.superseded import deprecation
+    deprecation(18083, "get_main_globals is deprecated, use sage.repl.user_globals.get_globals() instead")
+    from sage.repl.user_globals import get_globals
+    return get_globals()
 
 
 def inject_variable(name, value):
@@ -2378,7 +2366,7 @@ def inject_variable(name, value):
     A warning is issued the first time an existing value is overwritten::
 
         sage: inject_variable("a", 271)
-        doctest:...: RuntimeWarning: redefining global value `a`
+        doctest:...: RuntimeWarning: redefining global value 'a'
         sage: a
         271
         sage: inject_variable("a", 272)
@@ -2398,9 +2386,10 @@ def inject_variable(name, value):
     # Using globals() does not work, even in Cython, because
     # inject_variable is called not only from the interpreter, but
     # also from functions in various modules.
-    G = get_main_globals()
+    from sage.repl.user_globals import get_globals
+    G = get_globals()
     if name in G:
-        warn("redefining global value `%s`"%name, RuntimeWarning, stacklevel = 2)
+        warn("redefining global value {!r}".format(name), RuntimeWarning, stacklevel=2)
     G[name] = value
 
 
@@ -2421,7 +2410,7 @@ def inject_variable_test(name, value, depth):
         sage: a2
         314
         sage: inject_variable_test("a2", 271, 2)
-        doctest:...: RuntimeWarning: redefining global value `a2`
+        doctest:...: RuntimeWarning: redefining global value 'a2'
         sage: a2
         271
 
diff --git a/src/sage/misc/reset.pyx b/src/sage/misc/reset.pyx
@@ -1,4 +1,5 @@
 import sys
+from sage.repl.user_globals import get_globals
 
 # Exclude these from the reset command.
 # DATA, base64 -- needed by the notebook
@@ -65,7 +66,7 @@ def reset(vars=None, attached=False):
     if not vars is None:
         restore(vars)
         return
-    G = globals()  # this is the reason the code must be in Cython.
+    G = get_globals()
     T = type(sys)
     for k in G.keys():
         if k[0] != '_' and not isinstance(k, T) and k not in EXCLUDE:
@@ -118,7 +119,7 @@ def restore(vars=None):
         ...
         NameError: name 'ww' is not defined
     """
-    G = globals()  # this is the reason the code must be in Cython.
+    G = get_globals()
     if 'sage_mode' not in G:
         import sage.all
         D = sage.all.__dict__
diff --git a/src/sage/misc/sage_timeit_class.pyx b/src/sage/misc/sage_timeit_class.pyx
@@ -4,8 +4,6 @@ The ``timeit`` command
 This uses the function :func:`~sage.misc.sage_timeit.sage_timeit`.
 """
 
-# This is here in Cython so we can get the interpreter globals
-
 import sage_timeit
 
 
@@ -53,8 +51,8 @@ class SageTimeit:
 
         - ``code`` -- string of code to evaluate; may contain newlines.
 
-        - ``globs``  -- global variables; if not given, uses module scope
-          globals.
+        - ``globs``  -- global variables; if not given, uses the
+          user-space globals.
 
         - ``locals`` -- ignored completely.
 
@@ -77,7 +75,8 @@ class SageTimeit:
             3 loops, best of 3: ... ms per loop
         """
         if globs is None:
-            globs = globals()
+            from sage.repl.user_globals import get_globals
+            globs = get_globals()
         return sage_timeit.sage_timeit(code, globs, **kwds)
 
     def __call__(self, code, globals=None, preparse=None, **kwds):
@@ -87,10 +86,9 @@ class SageTimeit:
         - ``code`` -- a string. A line or block of code, which may
           contain newlines.
 
-        - ``globals`` -- optional global variables; if not given the
-          globals of the calling module are used (e.g., if using this
-          from the command line, the globals of the command line are
-          used).
+        - ``globals`` -- optional global variables; if not given, the
+          user-space globals are used (e.g., if using this from the
+          command line, the globals of the command line are used).
 
         - ``preparse`` -- Boolean or ``None`` (default). Whether or
           not to preparse the input code using the Sage preparser.  If
diff --git a/src/sage/numerical/interactive_simplex_method.py b/src/sage/numerical/interactive_simplex_method.py
@@ -193,7 +193,7 @@
                            randint,
                            random)
 from sage.misc.latex import EMBEDDED_MODE
-from sage.misc.misc import get_main_globals
+from sage.repl.user_globals import get_globals
 from sage.modules.all import random_vector, vector
 from sage.plot.all import Graphics, arrow, line, point, rainbow, text
 from sage.rings.all import Infinity, PolynomialRing, QQ, RDF, ZZ
@@ -1760,7 +1760,7 @@ def inject_variables(self, scope=None, verbose=True):
             x2 + 3*x1
         """
         if scope is None:
-            scope = get_main_globals()
+            scope = get_globals()
         try:
             self._R.inject_variables(scope, verbose)
         except AttributeError:
diff --git a/src/sage/repl/preparse.py b/src/sage/repl/preparse.py
diff --git a/src/sage/structure/category_object.pyx b/src/sage/structure/category_object.pyx
diff --git a/src/sage/structure/sage_object.pyx b/src/sage/structure/sage_object.pyx
diff --git a/src/setup.py b/src/setup.py

Original file line number	Diff line number	Diff line change
`@@ -68,9 +68,9 @@ def unpickle_function(pickled):`
`68`	`68`	`sage: unpickle_function(pickle_function(f))(3,5)`
`69`	`69`	`15`
`70`	`70`	`"""`
	`71`	`+ from sage.repl.user_globals import get_globals`
`71`	`72`	`recovered = cPickle.loads(pickled)`
`72`		`- return types.FunctionType(recovered, globals())`
`73`		`-`
	`73`	`+ return types.FunctionType(recovered, get_globals())`
`74`	`74`
`75`	`75`
`76`	`76`	`def call_pickled_function(fpargs):`