mirror of
https://github.com/python/cpython.git
synced 2025-10-26 19:24:34 +00:00
svn+ssh://pythondev@svn.python.org/python/trunk
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
NOTE: The merge does NOT contain the modified file Python/import.c from
r59288. I can't get it running. Nick, please check in the PEP 366
manually.
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
........
r59279 | georg.brandl | 2007-12-02 19:17:50 +0100 (Sun, 02 Dec 2007) | 2 lines
Fix a sentence I missed before. Do not merge to 3k.
........
r59281 | georg.brandl | 2007-12-02 22:58:54 +0100 (Sun, 02 Dec 2007) | 3 lines
Add documentation for PySys_* functions.
Written by Charlie Shepherd for GHOP. Also fixes #1245.
........
r59288 | nick.coghlan | 2007-12-03 13:55:17 +0100 (Mon, 03 Dec 2007) | 1 line
Implement PEP 366
........
r59290 | christian.heimes | 2007-12-03 14:47:29 +0100 (Mon, 03 Dec 2007) | 3 lines
Applied my patch #1455 with some extra fixes for VS 2005
The new msvc9compiler module supports VS 2005 and VS 2008. I've also fixed build_ext to support PCbuild8 and PCbuild9 and backported my fix for xxmodule.c from py3k. The old code msvccompiler is still in place in case somebody likes to build an extension with VS 2003 or earlier.
I've also updated the cygwin compiler module for VS 2005 and VS 2008. It works with VS 2005 but I'm unable to test it with VS 2008. We have to wait for a new version of cygwin.
........
r59291 | christian.heimes | 2007-12-03 14:55:16 +0100 (Mon, 03 Dec 2007) | 1 line
Added comment to Misc/NEWS for r59290
........
r59292 | christian.heimes | 2007-12-03 15:28:04 +0100 (Mon, 03 Dec 2007) | 1 line
I followed MA Lemberg's suggestion and added comments to the late initialization of the type slots.
........
r59293 | facundo.batista | 2007-12-03 17:29:52 +0100 (Mon, 03 Dec 2007) | 3 lines
Speedup and cleaning of __str__. Thanks Mark Dickinson.
........
r59294 | facundo.batista | 2007-12-03 18:55:00 +0100 (Mon, 03 Dec 2007) | 4 lines
Faster _fix function, and some reordering for a more elegant
coding. Thanks Mark Dickinson.
........
r59295 | martin.v.loewis | 2007-12-03 20:20:02 +0100 (Mon, 03 Dec 2007) | 5 lines
Issue #1727780: Support loading pickles of random.Random objects created
on 32-bit systems on 64-bit systems, and vice versa. As a consequence
of the change, Random pickles created by Python 2.6 cannot be loaded
in Python 2.5.
........
r59297 | facundo.batista | 2007-12-03 20:49:54 +0100 (Mon, 03 Dec 2007) | 3 lines
Two small fixes. Issue 1547.
........
r59299 | georg.brandl | 2007-12-03 20:57:02 +0100 (Mon, 03 Dec 2007) | 2 lines
#1548: fix apostroph placement.
........
r59300 | christian.heimes | 2007-12-03 21:01:02 +0100 (Mon, 03 Dec 2007) | 3 lines
Patch #1537 from Chad Austin
Change GeneratorExit's base class from Exception to BaseException
(This time I'm applying the patch to the correct sandbox.)
........
r59302 | georg.brandl | 2007-12-03 21:03:46 +0100 (Mon, 03 Dec 2007) | 3 lines
Add examples to the xmlrpclib docs.
Written for GHOP by Josip Dzolonga.
........
184 lines
6.3 KiB
Python
184 lines
6.3 KiB
Python
# Tests command line execution of scripts
|
|
from __future__ import with_statement
|
|
|
|
import unittest
|
|
import os
|
|
import os.path
|
|
import sys
|
|
import test.test_support
|
|
import tempfile
|
|
import subprocess
|
|
import py_compile
|
|
import contextlib
|
|
import shutil
|
|
import zipfile
|
|
|
|
verbose = test.test_support.verbose
|
|
|
|
# XXX ncoghlan: Should we consider moving these to test_support?
|
|
from test.test_cmd_line import _spawn_python, _kill_python
|
|
|
|
def _run_python(*args):
|
|
if __debug__:
|
|
p = _spawn_python(*args)
|
|
else:
|
|
p = _spawn_python('-O', *args)
|
|
stdout_data = _kill_python(p)
|
|
return p.wait(), stdout_data.decode()
|
|
|
|
@contextlib.contextmanager
|
|
def temp_dir():
|
|
dirname = tempfile.mkdtemp()
|
|
dirname = os.path.realpath(dirname)
|
|
try:
|
|
yield dirname
|
|
finally:
|
|
shutil.rmtree(dirname)
|
|
|
|
test_source = """\
|
|
# Script may be run with optimisation enabled, so don't rely on assert
|
|
# statements being executed
|
|
def assertEqual(lhs, rhs):
|
|
if lhs != rhs:
|
|
raise AssertionError('%r != %r' % (lhs, rhs))
|
|
def assertIdentical(lhs, rhs):
|
|
if lhs is not rhs:
|
|
raise AssertionError('%r is not %r' % (lhs, rhs))
|
|
# Check basic code execution
|
|
result = ['Top level assignment']
|
|
def f():
|
|
result.append('Lower level reference')
|
|
f()
|
|
assertEqual(result, ['Top level assignment', 'Lower level reference'])
|
|
# Check population of magic variables
|
|
assertEqual(__name__, '__main__')
|
|
print('__file__==%r' % __file__)
|
|
print('__package__==%r' % __package__)
|
|
# Check the sys module
|
|
import sys
|
|
assertIdentical(globals(), sys.modules[__name__].__dict__)
|
|
print('sys.argv[0]==%r' % sys.argv[0])
|
|
"""
|
|
|
|
def _make_test_script(script_dir, script_basename, source=test_source):
|
|
script_filename = script_basename+os.path.extsep+'py'
|
|
script_name = os.path.join(script_dir, script_filename)
|
|
script_file = open(script_name, 'w')
|
|
script_file.write(source)
|
|
script_file.close()
|
|
return script_name
|
|
|
|
def _compile_test_script(script_name):
|
|
py_compile.compile(script_name, doraise=True)
|
|
if __debug__:
|
|
compiled_name = script_name + 'c'
|
|
else:
|
|
compiled_name = script_name + 'o'
|
|
return compiled_name
|
|
|
|
def _make_test_zip(zip_dir, zip_basename, script_name):
|
|
zip_filename = zip_basename+os.path.extsep+"zip"
|
|
zip_name = os.path.join(zip_dir, zip_filename)
|
|
zip_file = zipfile.ZipFile(zip_name, 'w')
|
|
zip_file.write(script_name, os.path.basename(script_name))
|
|
zip_file.close()
|
|
# if verbose:
|
|
# zip_file = zipfile.ZipFile(zip_name, 'r')
|
|
# print("Contents of %r:" % zip_name)
|
|
# zip_file.printdir()
|
|
# zip_file.close()
|
|
return zip_name
|
|
|
|
def _make_test_pkg(pkg_dir):
|
|
os.mkdir(pkg_dir)
|
|
_make_test_script(pkg_dir, '__init__', '')
|
|
|
|
# There's no easy way to pass the script directory in to get
|
|
# -m to work (avoiding that is the whole point of making
|
|
# directories and zipfiles executable!)
|
|
# So we fake it for testing purposes with a custom launch script
|
|
launch_source = """\
|
|
import sys, os.path, runpy
|
|
sys.path[0:0] = os.path.dirname(__file__)
|
|
runpy._run_module_as_main(%r)
|
|
"""
|
|
|
|
def _make_launch_script(script_dir, script_basename, module_name):
|
|
return _make_test_script(script_dir, script_basename,
|
|
launch_source % module_name)
|
|
|
|
class CmdLineTest(unittest.TestCase):
|
|
def _check_script(self, script_name, expected_file,
|
|
expected_argv0, expected_package,
|
|
*cmd_line_switches):
|
|
run_args = cmd_line_switches + (script_name,)
|
|
exit_code, data = _run_python(*run_args)
|
|
if verbose:
|
|
print("Output from test script %r:" % script_name)
|
|
print(data)
|
|
self.assertEqual(exit_code, 0)
|
|
printed_file = '__file__==%r' % expected_file
|
|
printed_argv0 = 'sys.argv[0]==%r' % expected_argv0
|
|
printed_package = '__package__==%r' % expected_package
|
|
if verbose:
|
|
print('Expected output:')
|
|
print(printed_file)
|
|
print(printed_package)
|
|
print(printed_argv0)
|
|
self.assert_(printed_file in data)
|
|
self.assert_(printed_package in data)
|
|
self.assert_(printed_argv0 in data)
|
|
|
|
def test_basic_script(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, 'script')
|
|
self._check_script(script_name, script_name, script_name, None)
|
|
|
|
def test_script_compiled(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, 'script')
|
|
compiled_name = _compile_test_script(script_name)
|
|
os.remove(script_name)
|
|
self._check_script(compiled_name, compiled_name, compiled_name, None)
|
|
|
|
def test_directory(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, '__main__')
|
|
self._check_script(script_dir, script_name, script_dir, '')
|
|
|
|
def test_directory_compiled(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, '__main__')
|
|
compiled_name = _compile_test_script(script_name)
|
|
os.remove(script_name)
|
|
self._check_script(script_dir, compiled_name, script_dir, '')
|
|
|
|
def test_zipfile(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, '__main__')
|
|
zip_name = _make_test_zip(script_dir, 'test_zip', script_name)
|
|
self._check_script(zip_name, None, zip_name, '')
|
|
|
|
def test_zipfile_compiled(self):
|
|
with temp_dir() as script_dir:
|
|
script_name = _make_test_script(script_dir, '__main__')
|
|
compiled_name = _compile_test_script(script_name)
|
|
zip_name = _make_test_zip(script_dir, 'test_zip', compiled_name)
|
|
self._check_script(zip_name, None, zip_name, '')
|
|
|
|
def test_module_in_package(self):
|
|
with temp_dir() as script_dir:
|
|
pkg_dir = os.path.join(script_dir, 'test_pkg')
|
|
_make_test_pkg(pkg_dir)
|
|
script_name = _make_test_script(pkg_dir, 'script')
|
|
launch_name = _make_launch_script(script_dir, 'launch', 'test_pkg.script')
|
|
self._check_script(launch_name, script_name,
|
|
script_name, 'test_pkg')
|
|
|
|
|
|
def test_main():
|
|
test.test_support.run_unittest(CmdLineTest)
|
|
test.test_support.reap_children()
|
|
|
|
if __name__ == '__main__':
|
|
test_main()
|