[Python-checkins] cpython (merge default -> default): Merge.

[charles-francois.natali]

http://hg.python.org/cpython/rev/f23edd061d89
changeset:   91300:f23edd061d89
parent:      91299:ae0b572ced20
parent:      91298:04c8d7d337b4
user:        Charles-François Natali <cf.natali at gmail.com>
date:        Fri Jun 20 22:50:48 2014 +0100
summary:
  Merge.

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


diff --git a/Lib/test/script_helper.py b/Lib/test/script_helper.py
--- a/Lib/test/script_helper.py
+++ b/Lib/test/script_helper.py
@@ -155,8 +155,8 @@
     script_name = make_script(zip_dir, script_basename, source)
     unlink.append(script_name)
     if compiled:
-        init_name = py_compile(init_name, doraise=True)
-        script_name = py_compile(script_name, doraise=True)
+        init_name = py_compile.compile(init_name, doraise=True)
+        script_name = py_compile.compile(script_name, doraise=True)
         unlink.extend((init_name, script_name))
     pkg_names = [os.sep.join([pkg_name]*i) for i in range(1, depth+1)]
     script_name_in_zip = os.path.join(pkg_names[-1], os.path.basename(script_name))

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