diff options
Diffstat (limited to 'numpy/numarray/session.py')
| -rw-r--r-- | numpy/numarray/session.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/numpy/numarray/session.py b/numpy/numarray/session.py index 0982742ab..e40cd4033 100644 --- a/numpy/numarray/session.py +++ b/numpy/numarray/session.py @@ -72,6 +72,7 @@ Saved modules are re-imported at load time but any "state" in the module which is not restored by a simple import is lost. """ +from __future__ import division, absolute_import, print_function __all__ = ['load', 'save'] @@ -119,14 +120,14 @@ def _callers_modules(): g = _callers_globals() mods = [] for k,v in g.items(): - if type(v) == type(sys): + if isinstance(v, type(sys)): mods.append(getattr(v,"__name__")) return mods def _errout(*args): for a in args: - print >>sys.stderr, a, - print >>sys.stderr + print(a, end=' ', file=sys.stderr) + print(file=sys.stderr) def _verbose(*args): if VERBOSE: @@ -168,7 +169,7 @@ def _loadmodule(module): s = "" for i in range(len(modules)): s = ".".join(modules[:i+1]) - exec "import " + s + exec("import " + s) return sys.modules[module] class _ObjectProxy(object): @@ -267,11 +268,11 @@ def save(variables=None, file=SAVEFILE, dictionary=None, verbose=False): dictionary = _callers_globals() if variables is None: - keys = dictionary.keys() + keys = list(dictionary.keys()) else: keys = variables.split(",") - source_modules = _callers_modules() + sys.modules.keys() + source_modules = _callers_modules() + list(sys.modules.keys()) p = pickle.Pickler(file, protocol=2) @@ -325,13 +326,13 @@ def load(variables=None, file=SAVEFILE, dictionary=None, verbose=False): dictionary = _callers_globals() values = [] p = pickle.Unpickler(file) - while 1: + while True: o = p.load() if isinstance(o, _SaveSession): session = dict(zip(o.keys, values)) _verbose("updating dictionary with session variables.") if variables is None: - keys = session.keys() + keys = list(session.keys()) else: keys = variables.split(",") for k in keys: |