Skip to content

Commit 9cd1775

Browse files
tirantiran
committed
Merged revisions 59005-59040 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk I've tried to fix test_cmd_line_script but I wasn't able to get all tests right. Nick, can you please have a look? ........ r59020 | facundo.batista | 2007-11-16 19:04:14 +0100 (Fri, 16 Nov 2007) | 12 lines Now in find, rfind, index, and rindex, you can use None as defaults, as usual with slicing (both with str and unicode strings). This fixes issue 1259. For str only the stringobject.c file was modified. But for unicode, I needed to repeat in the four functions a lot of code, so created a new function that does part of the job for them (and placed it in find.h, following a suggestion of Barry). Also added tests for this behaviour. ........ r59021 | facundo.batista | 2007-11-16 19:41:24 +0100 (Fri, 16 Nov 2007) | 4 lines Fix for stupid error (I need to remember to do a full 'make clean + make' cycle before the tests...). Sorry. ........ r59022 | facundo.batista | 2007-11-16 20:16:15 +0100 (Fri, 16 Nov 2007) | 3 lines Made _ParseTupleFinds only defined to unicodeobject.c ........ r59024 | raymond.hettinger | 2007-11-17 02:51:22 +0100 (Sat, 17 Nov 2007) | 1 line Fix signature in example ........ r59033 | brett.cannon | 2007-11-17 08:07:29 +0100 (Sat, 17 Nov 2007) | 5 lines Remove a confusing sentence about pth files and which directories are searched for them. Closes issue python#1431. Thanks Giambattista Bloisi for the help. ........ r59039 | nick.coghlan | 2007-11-18 12:56:28 +0100 (Sun, 18 Nov 2007) | 1 line Patch #1739468: Directories and zipfiles containing __main__.py are now executable ........
1 parent 81ca7c7 commit 9cd1775

File tree

11 files changed

+359
-84
lines changed

11 files changed

+359
-84
lines changed

‎Doc/install/index.rst‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -612,8 +612,7 @@ will not override standard modules. This means you can't use this mechanism for
612612
installing fixed versions of standard modules.)
613613

614614
Paths can be absolute or relative, in which case they're relative to the
615-
directory containing the :file:`.pth` file. Any directories added to the search
616-
path will be scanned in turn for :file:`.pth` files. See the documentation of
615+
directory containing the :file:`.pth` file. See the documentation of
617616
the :mod:`site` module for more information.
618617

619618
A slightly less convenient way is to edit the :file:`site.py` file in Python's

‎Doc/library/collections.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,7 @@ Example::
427427
def __asdict__(self):
428428
'Return a new dict mapping field names to their values'
429429
return dict(zip(('x', 'y'), self))
430-
def __replace__(self, field, value):
430+
def __replace__(self, **kwds):
431431
'Return a new Point object replacing specified fields with new values'
432432
return Point(**dict(zip(('x', 'y'), self) + kwds.items()))
433433
x = property(itemgetter(0))

‎Include/import.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ PyAPI_FUNC(PyObject *) PyImport_ImportModuleEx(
2424
#define PyImport_ImportModuleEx(n, g, l, f) \
2525
PyImport_ImportModuleLevel(n, g, l, f, -1)
2626

27+
PyAPI_FUNC(PyObject *) PyImport_GetImporter(PyObject *path);
2728
PyAPI_FUNC(PyObject *) PyImport_Import(PyObject *name);
2829
PyAPI_FUNC(PyObject *) PyImport_ReloadModule(PyObject *m);
2930
PyAPI_FUNC(void) PyImport_Cleanup(void);
@@ -42,6 +43,7 @@ struct _inittab {
4243
void (*initfunc)(void);
4344
};
4445

46+
PyAPI_DATA(PyTypeObject) PyNullImporter_Type;
4547
PyAPI_DATA(struct _inittab *) PyImport_Inittab;
4648

4749
PyAPI_FUNC(int) PyImport_AppendInittab(char *name, void (*initfunc)(void));

‎Lib/test/string_tests.py‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,13 @@ def test_find(self):
146146
self.checkequal(3, 'abc', 'find', '', 3)
147147
self.checkequal(-1, 'abc', 'find', '', 4)
148148

149+
# to check the ability to pass None as defaults
150+
self.checkequal( 2, 'rrarrrrrrrrra', 'find', 'a')
151+
self.checkequal(12, 'rrarrrrrrrrra', 'find', 'a', 4)
152+
self.checkequal(-1, 'rrarrrrrrrrra', 'find', 'a', 4, 6)
153+
self.checkequal(12, 'rrarrrrrrrrra', 'find', 'a', 4, None)
154+
self.checkequal( 2, 'rrarrrrrrrrra', 'find', 'a', None, 6)
155+
149156
self.checkraises(TypeError, 'hello', 'find')
150157
self.checkraises(TypeError, 'hello', 'find', 42)
151158

@@ -183,6 +190,13 @@ def test_rfind(self):
183190
self.checkequal(3, 'abc', 'rfind', '', 3)
184191
self.checkequal(-1, 'abc', 'rfind', '', 4)
185192

193+
# to check the ability to pass None as defaults
194+
self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a')
195+
self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a', 4)
196+
self.checkequal(-1, 'rrarrrrrrrrra', 'rfind', 'a', 4, 6)
197+
self.checkequal(12, 'rrarrrrrrrrra', 'rfind', 'a', 4, None)
198+
self.checkequal( 2, 'rrarrrrrrrrra', 'rfind', 'a', None, 6)
199+
186200
self.checkraises(TypeError, 'hello', 'rfind')
187201
self.checkraises(TypeError, 'hello', 'rfind', 42)
188202

@@ -197,6 +211,13 @@ def test_index(self):
197211
self.checkraises(ValueError, 'abcdefghi', 'index', 'ghi', 8)
198212
self.checkraises(ValueError, 'abcdefghi', 'index', 'ghi', -1)
199213

214+
# to check the ability to pass None as defaults
215+
self.checkequal( 2, 'rrarrrrrrrrra', 'index', 'a')
216+
self.checkequal(12, 'rrarrrrrrrrra', 'index', 'a', 4)
217+
self.checkraises(ValueError, 'rrarrrrrrrrra', 'index', 'a', 4, 6)
218+
self.checkequal(12, 'rrarrrrrrrrra', 'index', 'a', 4, None)
219+
self.checkequal( 2, 'rrarrrrrrrrra', 'index', 'a', None, 6)
220+
200221
self.checkraises(TypeError, 'hello', 'index')
201222
self.checkraises(TypeError, 'hello', 'index', 42)
202223

@@ -212,6 +233,13 @@ def test_rindex(self):
212233
self.checkraises(ValueError, 'abcdefghi', 'rindex', 'ghi', 0, 8)
213234
self.checkraises(ValueError, 'abcdefghi', 'rindex', 'ghi', 0, -1)
214235

236+
# to check the ability to pass None as defaults
237+
self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a')
238+
self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a', 4)
239+
self.checkraises(ValueError, 'rrarrrrrrrrra', 'rindex', 'a', 4, 6)
240+
self.checkequal(12, 'rrarrrrrrrrra', 'rindex', 'a', 4, None)
241+
self.checkequal( 2, 'rrarrrrrrrrra', 'rindex', 'a', None, 6)
242+
215243
self.checkraises(TypeError, 'hello', 'rindex')
216244
self.checkraises(TypeError, 'hello', 'rindex', 42)
217245

‎Lib/test/test_cmd_line.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
# Tests invocation of the interpreter with various command line arguments
2+
# All tests are executed with environment variables ignored
3+
# See test_cmd_line_script.py for testing of script execution
14

25
import test.test_support, unittest
36
import sys

‎Lib/test/test_cmd_line_script.py‎

Lines changed: 145 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,145 @@
1+
# Tests command line execution of scripts
2+
from __future__ import with_statement
3+
4+
import unittest
5+
import os
6+
import os.path
7+
import sys
8+
import test
9+
import tempfile
10+
import subprocess
11+
import py_compile
12+
import contextlib
13+
import shutil
14+
import zipfile
15+
16+
verbose = test.test_support.verbose
17+
18+
# XXX ncoghlan: Should we consider moving these to test_support?
19+
from .test_cmd_line import _spawn_python, _kill_python
20+
21+
def _run_python(*args):
22+
if __debug__:
23+
p = _spawn_python(*args)
24+
else:
25+
p = _spawn_python('-O', *args)
26+
stdout_data = _kill_python(p)
27+
return p.wait(), stdout_data.decode()
28+
29+
@contextlib.contextmanager
30+
def temp_dir():
31+
dirname = tempfile.mkdtemp()
32+
try:
33+
yield dirname
34+
finally:
35+
shutil.rmtree(dirname)
36+
37+
test_source = ("""\
38+
# Script may be run with optimisation enabled, so don't rely on assert
39+
# statements being executed
40+
def assertEqual(lhs, rhs):
41+
if lhs != rhs:
42+
raise AssertionError("%r != %r" % (lhs, rhs))
43+
def assertIdentical(lhs, rhs):
44+
if lhs is not rhs:
45+
raise AssertionError("%r is not %r" % (lhs, rhs))
46+
# Check basic code execution
47+
result = ['Top level assignment']
48+
def f():
49+
result.append('Lower level reference')
50+
f()
51+
assertEqual(result, ['Top level assignment', 'Lower level reference'])
52+
# Check population of magic variables
53+
assertEqual(__name__, '__main__')
54+
print('__file__==%r' % __file__)
55+
# Check the sys module
56+
import sys
57+
assertIdentical(globals(), sys.modules[__name__].__dict__)
58+
print('sys.argv[0]==%r' % sys.argv[0])
59+
""")
60+
61+
def _make_test_script(script_dir, script_basename):
62+
script_filename = script_basename+os.path.extsep+"py"
63+
script_name = os.path.join(script_dir, script_filename)
64+
script_file = open(script_name, "w")
65+
script_file.write(test_source)
66+
script_file.close()
67+
return script_name
68+
69+
def _compile_test_script(script_name):
70+
py_compile.compile(script_name, doraise=True)
71+
if __debug__:
72+
compiled_name = script_name + 'c'
73+
else:
74+
compiled_name = script_name + 'o'
75+
return compiled_name
76+
77+
def _make_test_zip(zip_dir, zip_basename, script_name):
78+
zip_filename = zip_basename+os.path.extsep+"zip"
79+
zip_name = os.path.join(zip_dir, zip_filename)
80+
zip_file = zipfile.ZipFile(zip_name, 'w')
81+
zip_file.write(script_name, os.path.basename(script_name))
82+
zip_file.close()
83+
# if verbose:
84+
# zip_file = zipfile.ZipFile(zip_name, 'r')
85+
# print "Contents of %r:" % zip_name
86+
# zip_file.printdir()
87+
# zip_file.close()
88+
return zip_name
89+
90+
class CmdLineTest(unittest.TestCase):
91+
def _check_script(self, script_name, expected_file, expected_argv0):
92+
exit_code, data = _run_python(script_name)
93+
# if verbose:
94+
# print "Output from test script %r:" % script_name
95+
# print data
96+
self.assertEqual(exit_code, 0, data)
97+
printed_file = '__file__==%r' % expected_file
98+
printed_argv0 = 'sys.argv[0]==%r' % expected_argv0
99+
self.assert_(printed_file in data, (printed_file, data))
100+
self.assert_(printed_argv0 in data, (printed_argv0, data))
101+
102+
def test_basic_script(self):
103+
with temp_dir() as script_dir:
104+
script_name = _make_test_script(script_dir, "script")
105+
self._check_script(script_name, script_name, script_name)
106+
107+
def test_script_compiled(self):
108+
with temp_dir() as script_dir:
109+
script_name = _make_test_script(script_dir, "script")
110+
compiled_name = _compile_test_script(script_name)
111+
os.remove(script_name)
112+
self._check_script(compiled_name, compiled_name, compiled_name)
113+
114+
def test_directory(self):
115+
with temp_dir() as script_dir:
116+
script_name = _make_test_script(script_dir, "__main__")
117+
self._check_script(script_dir, script_name, script_dir)
118+
119+
def test_directory_compiled(self):
120+
with temp_dir() as script_dir:
121+
script_name = _make_test_script(script_dir, "__main__")
122+
compiled_name = _compile_test_script(script_name)
123+
os.remove(script_name)
124+
self._check_script(script_dir, compiled_name, script_dir)
125+
126+
def test_zipfile(self):
127+
with temp_dir() as script_dir:
128+
script_name = _make_test_script(script_dir, "__main__")
129+
zip_name = _make_test_zip(script_dir, "test_zip", script_name)
130+
self._check_script(zip_name, None, zip_name)
131+
132+
def test_zipfile_compiled(self):
133+
with temp_dir() as script_dir:
134+
script_name = _make_test_script(script_dir, "__main__")
135+
compiled_name = _compile_test_script(script_name)
136+
zip_name = _make_test_zip(script_dir, "test_zip", compiled_name)
137+
self._check_script(zip_name, None, zip_name)
138+
139+
140+
def test_main():
141+
test.test_support.run_unittest(CmdLineTest)
142+
test.test_support.reap_children()
143+
144+
if __name__ == "__main__":
145+
test_main()

0 commit comments

Comments
 (0)