[Python-checkins] cpython (merge 3.4 -> default): Issue #14235: Merge from 3.4.

[berker.peksag]

http://hg.python.org/cpython/rev/10a1e7780ee7
changeset:   91472:10a1e7780ee7
parent:      91470:3b5279b5bfd1
parent:      91471:d943089af1c6
user:        Berker Peksag <berker.peksag at gmail.com>
date:        Mon Jun 30 04:05:54 2014 +0300
summary:
  Issue #14235: Merge from 3.4.

files:
  Lib/test/test_cmd.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_cmd.py b/Lib/test/test_cmd.py
--- a/Lib/test/test_cmd.py
+++ b/Lib/test/test_cmd.py
@@ -229,7 +229,7 @@
     trace = support.import_module('trace')
     tracer=trace.Trace(ignoredirs=[sys.base_prefix, sys.base_exec_prefix,],
                         trace=0, count=1)
-    tracer.run('reload(cmd);test_main()')
+    tracer.run('import importlib; importlib.reload(cmd); test_main()')
     r=tracer.results()
     print("Writing coverage results...")
     r.write_results(show_missing=True, summary=True, coverdir=coverdir)

-- 
Repository URL: http://hg.python.org/cpython