From dcebe0f2dca40a22654c5f09ce1bd141419ea8d3 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Tue, 15 Mar 2011 19:20:44 -0400 Subject: [PATCH 01/30] Closes issue 11133. Fixes two cases where inspect.getattr_static could trigger code execution --- Doc/library/inspect.rst | 9 +++----- Lib/inspect.py | 27 ++++++++++++++++++----- Lib/test/test_inspect.py | 47 ++++++++++++++++++++++++++++++++++++++++ Misc/NEWS | 5 ++++- 4 files changed, 75 insertions(+), 13 deletions(-) diff --git a/Doc/library/inspect.rst b/Doc/library/inspect.rst index 754f7289bf6..7a57a0d3110 100644 --- a/Doc/library/inspect.rst +++ b/Doc/library/inspect.rst @@ -589,13 +589,10 @@ but avoids executing code when it fetches attributes. that raise AttributeError). It can also return descriptors objects instead of instance members. - .. versionadded:: 3.2 + If the instance `__dict__` is shadowed by another member (for example a + property) then this function will be unable to find instance members. -The only known case that can cause `getattr_static` to trigger code execution, -and cause it to return incorrect results (or even break), is where a class uses -:data:`~object.__slots__` and provides a `__dict__` member using a property or -descriptor. If you find other cases please report them so they can be fixed -or documented. + .. versionadded:: 3.2 `getattr_static` does not resolve descriptors, for example slot descriptors or getset descriptors on objects implemented in C. The descriptor object diff --git a/Lib/inspect.py b/Lib/inspect.py index ed10ac57d29..aa951d83e24 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -1069,15 +1069,16 @@ def _check_instance(obj, attr): instance_dict = object.__getattribute__(obj, "__dict__") except AttributeError: pass - return instance_dict.get(attr, _sentinel) + return dict.get(instance_dict, attr, _sentinel) def _check_class(klass, attr): for entry in _static_getmro(klass): - try: - return entry.__dict__[attr] - except KeyError: - pass + if not _shadowed_dict(type(entry)): + try: + return entry.__dict__[attr] + except KeyError: + pass return _sentinel def _is_type(obj): @@ -1087,6 +1088,19 @@ def _is_type(obj): return False return True +def _shadowed_dict(klass): + dict_attr = type.__dict__["__dict__"] + for entry in _static_getmro(klass): + try: + class_dict = dict_attr.__get__(entry)["__dict__"] + except KeyError: + pass + else: + if not (type(class_dict) is types.GetSetDescriptorType and + class_dict.__name__ == "__dict__" and + class_dict.__objclass__ is entry): + return True + return False def getattr_static(obj, attr, default=_sentinel): """Retrieve attributes without triggering dynamic lookup via the @@ -1101,8 +1115,9 @@ def getattr_static(obj, attr, default=_sentinel): """ instance_result = _sentinel if not _is_type(obj): - instance_result = _check_instance(obj, attr) klass = type(obj) + if not _shadowed_dict(klass): + instance_result = _check_instance(obj, attr) else: klass = obj diff --git a/Lib/test/test_inspect.py b/Lib/test/test_inspect.py index ccfcaba8baa..331d2475001 100644 --- a/Lib/test/test_inspect.py +++ b/Lib/test/test_inspect.py @@ -906,6 +906,53 @@ class TestGetattrStatic(unittest.TestCase): self.assertEqual(inspect.getattr_static(Something(), 'foo'), 3) self.assertEqual(inspect.getattr_static(Something, 'foo'), 3) + def test_dict_as_property(self): + test = self + test.called = False + + class Foo(dict): + a = 3 + @property + def __dict__(self): + test.called = True + return {} + + foo = Foo() + foo.a = 4 + self.assertEqual(inspect.getattr_static(foo, 'a'), 3) + self.assertFalse(test.called) + + def test_custom_object_dict(self): + test = self + test.called = False + + class Custom(dict): + def get(self, key, default=None): + test.called = True + super().get(key, default) + + class Foo(object): + a = 3 + foo = Foo() + foo.__dict__ = Custom() + self.assertEqual(inspect.getattr_static(foo, 'a'), 3) + self.assertFalse(test.called) + + def test_metaclass_dict_as_property(self): + class Meta(type): + @property + def __dict__(self): + self.executed = True + + class Thing(metaclass=Meta): + executed = False + + def __init__(self): + self.spam = 42 + + instance = Thing() + self.assertEqual(inspect.getattr_static(instance, "spam"), 42) + self.assertFalse(Thing.executed) class TestGetGeneratorState(unittest.TestCase): diff --git a/Misc/NEWS b/Misc/NEWS index 42330ff40da..78442fac2fb 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #11133: fix two cases where inspect.getattr_static can trigger code + execution. Patch by Daniel Urban. + - Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. @@ -48,7 +51,7 @@ Library encoding was not done if euc-jp or shift-jis was specified as the charset. - Issue #11500: Fixed a bug in the os x proxy bypass code for fully qualified - IP addresses in the proxy exception list. + IP addresses in the proxy exception list. - Issue #11491: dbm.error is no longer raised when dbm.open is called with the "n" as the flag argument and the file exists. The behavior matches From 15aded8b73256bc94fdd2e74b0c2c90fed46bb7e Mon Sep 17 00:00:00 2001 From: Raymond Hettinger Date: Tue, 15 Mar 2011 17:25:51 -0700 Subject: [PATCH 02/30] Emphasize the ['x', 'y'] option for listing field names. Remove PS2 prompts to make the examples cut-and-pasteable. --- Doc/library/collections.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst index 8b80b645dcc..0fadc265a3b 100644 --- a/Doc/library/collections.rst +++ b/Doc/library/collections.rst @@ -590,7 +590,7 @@ they add the ability to access fields by name instead of position index. :options: +NORMALIZE_WHITESPACE >>> # Basic example - >>> Point = namedtuple('Point', 'x y') + >>> Point = namedtuple('Point', ['x', 'y']) >>> p = Point(x=10, y=11) >>> # Example using the verbose option to print the class definition @@ -735,15 +735,15 @@ functionality with a subclass. Here is how to add a calculated field and a fixed-width print format: >>> class Point(namedtuple('Point', 'x y')): - ... __slots__ = () - ... @property - ... def hypot(self): - ... return (self.x ** 2 + self.y ** 2) ** 0.5 - ... def __str__(self): - ... return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) + __slots__ = () + @property + def hypot(self): + return (self.x ** 2 + self.y ** 2) ** 0.5 + def __str__(self): + return 'Point: x=%6.3f y=%6.3f hypot=%6.3f' % (self.x, self.y, self.hypot) >>> for p in Point(3, 4), Point(14, 5/7): - ... print(p) + print(p) Point: x= 3.000 y= 4.000 hypot= 5.000 Point: x=14.000 y= 0.714 hypot=14.018 @@ -770,7 +770,7 @@ and more efficient to use a simple class declaration: >>> Status.open, Status.pending, Status.closed (0, 1, 2) >>> class Status: - ... open, pending, closed = range(3) + open, pending, closed = range(3) .. seealso:: From cee36555683b4fa47c335beb6dfc2b487ad6af86 Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Wed, 16 Mar 2011 01:33:16 +0100 Subject: [PATCH 03/30] Close issue #8600: test_gdb failures because innocuous warnings --- Lib/test/test_gdb.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Lib/test/test_gdb.py b/Lib/test/test_gdb.py index 5127a6fc527..17b44ea354d 100644 --- a/Lib/test/test_gdb.py +++ b/Lib/test/test_gdb.py @@ -127,6 +127,9 @@ class DebuggerTests(unittest.TestCase): " inferior's thread library, thread debugging will" " not be available.\n", '') + err = err.replace("warning: Cannot initialize thread debugging" + " library: Debugger service failed\n", + '') # Ensure no unexpected error messages: self.assertEqual(err, '') From 13925008dc11f2a235627dc8c0440c0ce99171d9 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 16 Mar 2011 11:05:33 +0200 Subject: [PATCH 04/30] #11565: Fix several typos. Patch by Piotr Kasprzyk. --- Demo/turtle/tdemo_bytedesign.py | 2 +- Doc/includes/sqlite3/shared_cache.py | 2 +- Include/abstract.h | 4 ++-- Include/pymacconfig.h | 2 +- Lib/csv.py | 2 +- Lib/ctypes/test/test_arrays.py | 2 +- Lib/ctypes/test/test_init.py | 2 +- Lib/ctypes/test/test_numbers.py | 2 +- Lib/ctypes/test/test_win32.py | 2 +- Lib/difflib.py | 2 +- Lib/distutils/cmd.py | 2 +- Lib/distutils/cygwinccompiler.py | 2 +- Lib/distutils/tests/test_clean.py | 2 +- Lib/distutils/tests/test_install.py | 2 +- Lib/distutils/tests/test_sdist.py | 2 +- Lib/doctest.py | 4 ++-- Lib/email/header.py | 2 +- Lib/idlelib/FormatParagraph.py | 2 +- Lib/idlelib/extend.txt | 2 +- Lib/idlelib/macosxSupport.py | 4 ++-- Lib/lib2to3/fixes/fix_metaclass.py | 2 +- Lib/lib2to3/pgen2/conv.py | 4 ++-- Lib/lib2to3/pytree.py | 4 ++-- Lib/lib2to3/tests/data/py2_test_grammar.py | 2 +- Lib/lib2to3/tests/data/py3_test_grammar.py | 2 +- Lib/ntpath.py | 2 +- Lib/pickletools.py | 2 +- Lib/platform.py | 2 +- Lib/pstats.py | 2 +- Lib/subprocess.py | 2 +- Lib/test/pyclbr_input.py | 2 +- Lib/test/test_capi.py | 2 +- Lib/test/test_datetime.py | 2 +- Lib/test/test_decimal.py | 2 +- Lib/test/test_descr.py | 2 +- Lib/test/test_doctest.py | 10 +++++----- Lib/test/test_extcall.py | 2 +- Lib/test/test_float.py | 4 ++-- Lib/test/test_grammar.py | 2 +- Lib/test/test_httpservers.py | 2 +- Lib/test/test_iterlen.py | 4 ++-- Lib/test/test_itertools.py | 2 +- Lib/test/test_marshal.py | 2 +- Lib/test/test_math.py | 2 +- Lib/test/test_mmap.py | 2 +- Lib/test/test_multiprocessing.py | 4 ++-- Lib/test/test_pkg.py | 2 +- Lib/test/test_print.py | 2 +- Lib/test/test_strlit.py | 2 +- Lib/test/test_strptime.py | 2 +- Lib/test/test_struct.py | 2 +- Lib/test/test_syntax.py | 2 +- Lib/test/test_sys.py | 2 +- Lib/test/test_threading.py | 2 +- Lib/test/test_trace.py | 2 +- Lib/test/test_urllib.py | 2 +- Lib/test/test_warnings.py | 2 +- Lib/tkinter/test/test_ttk/test_functions.py | 2 +- Lib/tkinter/tix.py | 8 ++++---- Lib/tkinter/ttk.py | 2 +- Lib/turtle.py | 12 ++++++------ Lib/xml/dom/minicompat.py | 2 +- Lib/xml/dom/minidom.py | 2 +- Lib/xmlrpc/server.py | 2 +- Mac/BuildScript/build-installer.py | 2 +- Modules/_ctypes/_ctypes.c | 2 +- Modules/_ctypes/callbacks.c | 2 +- Modules/_ctypes/callproc.c | 2 +- Modules/_functoolsmodule.c | 2 +- Modules/_io/iobase.c | 2 +- Modules/_io/stringio.c | 2 +- Modules/_pickle.c | 2 +- Modules/_sqlite/connection.h | 2 +- Modules/cmathmodule.c | 2 +- Modules/socketmodule.c | 12 ++++++------ Modules/timemodule.c | 2 +- Modules/zipimport.c | 2 +- Modules/zlib/deflate.h | 2 +- Modules/zlib/gzio.c | 4 ++-- Objects/dictobject.c | 2 +- Objects/listobject.c | 2 +- Objects/longobject.c | 4 ++-- Objects/typeobject.c | 4 ++-- PC/bdist_wininst/extract.c | 4 ++-- PC/bdist_wininst/install.c | 4 ++-- PC/os2emx/dlfcn.c | 2 +- PC/os2emx/dlfcn.h | 2 +- Python/ceval.c | 4 ++-- Python/pystate.c | 2 +- Python/thread.c | 2 +- Tools/freeze/checkextensions_win32.py | 2 +- Tools/scripts/fixcid.py | 2 +- Tools/unicode/makeunicodedata.py | 2 +- setup.py | 4 ++-- 94 files changed, 126 insertions(+), 126 deletions(-) diff --git a/Demo/turtle/tdemo_bytedesign.py b/Demo/turtle/tdemo_bytedesign.py index 2e2ac624a00..85f288742b8 100644 --- a/Demo/turtle/tdemo_bytedesign.py +++ b/Demo/turtle/tdemo_bytedesign.py @@ -4,7 +4,7 @@ tdemo_bytedesign.py An example adapted from the example-suite -of PythonCard's turtle graphcis. +of PythonCard's turtle graphics. It's based on an article in BYTE magazine Problem Solving with Logo: Using Turtle diff --git a/Doc/includes/sqlite3/shared_cache.py b/Doc/includes/sqlite3/shared_cache.py index bf1d7b4a21d..30e71c935ff 100644 --- a/Doc/includes/sqlite3/shared_cache.py +++ b/Doc/includes/sqlite3/shared_cache.py @@ -1,6 +1,6 @@ import sqlite3 # The shared cache is only available in SQLite versions 3.3.3 or later -# See the SQLite documentaton for details. +# See the SQLite documentation for details. sqlite3.enable_shared_cache(True) diff --git a/Include/abstract.h b/Include/abstract.h index e9d17298211..bbc00926d47 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -466,7 +466,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ arbitrary data. 0 is returned on success. buffer and buffer_len are only - set in case no error occurrs. Otherwise, -1 is returned and + set in case no error occurs. Otherwise, -1 is returned and an exception set. */ @@ -480,7 +480,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ writable memory location in buffer of size buffer_len. 0 is returned on success. buffer and buffer_len are only - set in case no error occurrs. Otherwise, -1 is returned and + set in case no error occurs. Otherwise, -1 is returned and an exception set. */ diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 9e058c18ccd..9dd93177138 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -55,7 +55,7 @@ # endif # if defined(__LP64__) - /* MacOSX 10.4 (the first release to suppport 64-bit code + /* MacOSX 10.4 (the first release to support 64-bit code * at all) only supports 64-bit in the UNIX layer. * Therefore surpress the toolbox-glue in 64-bit mode. */ diff --git a/Lib/csv.py b/Lib/csv.py index 59ec372ec0a..dbe6db7eadb 100644 --- a/Lib/csv.py +++ b/Lib/csv.py @@ -270,7 +270,7 @@ class Sniffer: an all or nothing approach, so we allow for small variations in this number. 1) build a table of the frequency of each character on every line. - 2) build a table of freqencies of this frequency (meta-frequency?), + 2) build a table of frequencies of this frequency (meta-frequency?), e.g. 'x occurred 5 times in 10 rows, 6 times in 1000 rows, 7 times in 2 rows' 3) use the mode of the meta-frequency to determine the /expected/ diff --git a/Lib/ctypes/test/test_arrays.py b/Lib/ctypes/test/test_arrays.py index c0cdfd5b785..d11de287221 100644 --- a/Lib/ctypes/test/test_arrays.py +++ b/Lib/ctypes/test/test_arrays.py @@ -37,7 +37,7 @@ class ArrayTestCase(unittest.TestCase): values = [ia[i] for i in range(len(init))] self.assertEqual(values, [0] * len(init)) - # Too many in itializers should be caught + # Too many initializers should be caught self.assertRaises(IndexError, int_array, *range(alen*2)) CharArray = ARRAY(c_char, 3) diff --git a/Lib/ctypes/test/test_init.py b/Lib/ctypes/test/test_init.py index 94928c846a7..75fad112a01 100644 --- a/Lib/ctypes/test/test_init.py +++ b/Lib/ctypes/test/test_init.py @@ -27,7 +27,7 @@ class InitTest(unittest.TestCase): self.assertEqual((y.x.a, y.x.b), (0, 0)) self.assertEqual(y.x.new_was_called, False) - # But explicitely creating an X structure calls __new__ and __init__, of course. + # But explicitly creating an X structure calls __new__ and __init__, of course. x = X() self.assertEqual((x.a, x.b), (9, 12)) self.assertEqual(x.new_was_called, True) diff --git a/Lib/ctypes/test/test_numbers.py b/Lib/ctypes/test/test_numbers.py index 24d7293e893..244dbaf5122 100644 --- a/Lib/ctypes/test/test_numbers.py +++ b/Lib/ctypes/test/test_numbers.py @@ -157,7 +157,7 @@ class NumberTestCase(unittest.TestCase): def test_int_from_address(self): from array import array for t in signed_types + unsigned_types: - # the array module doesn't suppport all format codes + # the array module doesn't support all format codes # (no 'q' or 'Q') try: array(t._type_) diff --git a/Lib/ctypes/test/test_win32.py b/Lib/ctypes/test/test_win32.py index 5dedd9f1f62..2534a748cd9 100644 --- a/Lib/ctypes/test/test_win32.py +++ b/Lib/ctypes/test/test_win32.py @@ -17,7 +17,7 @@ if sys.platform == "win32" and sizeof(c_void_p) == sizeof(c_int): # ValueError: Procedure probably called with not enough arguments (4 bytes missing) self.assertRaises(ValueError, IsWindow) - # This one should succeeed... + # This one should succeed... self.assertEqual(0, IsWindow(0)) # ValueError: Procedure probably called with too many arguments (8 bytes in excess) diff --git a/Lib/difflib.py b/Lib/difflib.py index 264860e2a38..24a58a61c06 100644 --- a/Lib/difflib.py +++ b/Lib/difflib.py @@ -1712,7 +1712,7 @@ class HtmlDiff(object): line = line.replace(' ','\0') # expand tabs into spaces line = line.expandtabs(self._tabsize) - # relace spaces from expanded tabs back into tab characters + # replace spaces from expanded tabs back into tab characters # (we'll replace them with markup after we do differencing) line = line.replace(' ','\t') return line.replace('\0',' ').rstrip('\n') diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py index ae4efc7efc3..5b1d085c327 100644 --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -359,7 +359,7 @@ class Command: not self.force, dry_run=self.dry_run) def move_file (self, src, dst, level=1): - """Move a file respectin dry-run flag.""" + """Move a file respecting dry-run flag.""" return file_util.move_file(src, dst, dry_run=self.dry_run) def spawn(self, cmd, search_path=1, level=1): diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py index 95fa3ed3c8c..536aa6b61b2 100644 --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -155,7 +155,7 @@ class CygwinCCompiler(UnixCCompiler): self.dll_libraries = get_msvcr() def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts): - """Compiles the source by spawing GCC and windres if needed.""" + """Compiles the source by spawning GCC and windres if needed.""" if ext == '.rc' or ext == '.res': # gcc needs '.res' and '.rc' compiled to object files !!! try: diff --git a/Lib/distutils/tests/test_clean.py b/Lib/distutils/tests/test_clean.py index 649855f7ab4..eb8958bff5a 100755 --- a/Lib/distutils/tests/test_clean.py +++ b/Lib/distutils/tests/test_clean.py @@ -39,7 +39,7 @@ class cleanTestCase(support.TempdirManager, self.assertTrue(not os.path.exists(path), '%s was not removed' % path) - # let's run the command again (should spit warnings but suceed) + # let's run the command again (should spit warnings but succeed) cmd.all = 1 cmd.ensure_finalized() cmd.run() diff --git a/Lib/distutils/tests/test_install.py b/Lib/distutils/tests/test_install.py index a76e3e7a3cb..ed69b0cbb06 100644 --- a/Lib/distutils/tests/test_install.py +++ b/Lib/distutils/tests/test_install.py @@ -62,7 +62,7 @@ class InstallTestCase(support.TempdirManager, if sys.version < '2.6': return - # preparing the environement for the test + # preparing the environment for the test self.old_user_base = site.USER_BASE self.old_user_site = site.USER_SITE self.tmpdir = self.mkdtemp() diff --git a/Lib/distutils/tests/test_sdist.py b/Lib/distutils/tests/test_sdist.py index eaf39a45bae..c7dd47fb5c3 100644 --- a/Lib/distutils/tests/test_sdist.py +++ b/Lib/distutils/tests/test_sdist.py @@ -311,7 +311,7 @@ class SDistTestCase(PyPIRCCommandTestCase): # adding a file self.write_file((self.tmp_dir, 'somecode', 'doc2.txt'), '#') - # make sure build_py is reinitinialized, like a fresh run + # make sure build_py is reinitialized, like a fresh run build_py = dist.get_command_obj('build_py') build_py.finalized = False build_py.ensure_finalized() diff --git a/Lib/doctest.py b/Lib/doctest.py index 7554a1fdbe4..fae333e4f63 100644 --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -1210,7 +1210,7 @@ class DocTestRunner: # Process each example. for examplenum, example in enumerate(test.examples): - # If REPORT_ONLY_FIRST_FAILURE is set, then supress + # If REPORT_ONLY_FIRST_FAILURE is set, then suppress # reporting after the first failure. quiet = (self.optionflags & REPORT_ONLY_FIRST_FAILURE and failures > 0) @@ -2132,7 +2132,7 @@ class DocTestCase(unittest.TestCase): caller can catch the errors and initiate post-mortem debugging. The DocTestCase provides a debug method that raises - UnexpectedException errors if there is an unexepcted + UnexpectedException errors if there is an unexpected exception: >>> test = DocTestParser().get_doctest('>>> raise KeyError\n42', diff --git a/Lib/email/header.py b/Lib/email/header.py index a391255bd66..43220df7620 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -46,7 +46,7 @@ ecre = re.compile(r''' # For use with .match() fcre = re.compile(r'[\041-\176]+:$') -# Find a header embeded in a putative header value. Used to check for +# Find a header embedded in a putative header value. Used to check for # header injection attack. _embeded_header = re.compile(r'\n[^ \t]+:') diff --git a/Lib/idlelib/FormatParagraph.py b/Lib/idlelib/FormatParagraph.py index 02f96d493a3..6a5f9b5dd59 100644 --- a/Lib/idlelib/FormatParagraph.py +++ b/Lib/idlelib/FormatParagraph.py @@ -54,7 +54,7 @@ class FormatParagraph: # If the block ends in a \n, we dont want the comment # prefix inserted after it. (Im not sure it makes sense to # reformat a comment block that isnt made of complete - # lines, but whatever!) Can't think of a clean soltution, + # lines, but whatever!) Can't think of a clean solution, # so we hack away block_suffix = "" if not newdata[-1]: diff --git a/Lib/idlelib/extend.txt b/Lib/idlelib/extend.txt index f5fb3e0409c..165e044b5d1 100644 --- a/Lib/idlelib/extend.txt +++ b/Lib/idlelib/extend.txt @@ -18,7 +18,7 @@ window. An IDLE extension class is instantiated with a single argument, `editwin', an EditorWindow instance. The extension cannot assume much -about this argument, but it is guarateed to have the following instance +about this argument, but it is guaranteed to have the following instance variables: text a Text instance (a widget) diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py index 9b677e1d3b5..da519f7a0fc 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -15,8 +15,8 @@ def runningAsOSXApp(): def addOpenEventSupport(root, flist): """ - This ensures that the application will respont to open AppleEvents, which - makes is feaseable to use IDLE as the default application for python files. + This ensures that the application will respond to open AppleEvents, which + makes is feasible to use IDLE as the default application for python files. """ def doOpenFile(*args): for fn in args: diff --git a/Lib/lib2to3/fixes/fix_metaclass.py b/Lib/lib2to3/fixes/fix_metaclass.py index f924ace09e4..7d4d002f976 100644 --- a/Lib/lib2to3/fixes/fix_metaclass.py +++ b/Lib/lib2to3/fixes/fix_metaclass.py @@ -48,7 +48,7 @@ def fixup_parse_tree(cls_node): """ for node in cls_node.children: if node.type == syms.suite: - # already in the prefered format, do nothing + # already in the preferred format, do nothing return # !%@#! oneliners have no suite node, we have to fake one up diff --git a/Lib/lib2to3/pgen2/conv.py b/Lib/lib2to3/pgen2/conv.py index 1d648d6a2e5..bf49762ae48 100644 --- a/Lib/lib2to3/pgen2/conv.py +++ b/Lib/lib2to3/pgen2/conv.py @@ -51,7 +51,7 @@ class Converter(grammar.Grammar): self.finish_off() def parse_graminit_h(self, filename): - """Parse the .h file writen by pgen. (Internal) + """Parse the .h file written by pgen. (Internal) This file is a sequence of #define statements defining the nonterminals of the grammar as numbers. We build two tables @@ -82,7 +82,7 @@ class Converter(grammar.Grammar): return True def parse_graminit_c(self, filename): - """Parse the .c file writen by pgen. (Internal) + """Parse the .c file written by pgen. (Internal) The file looks as follows. The first two lines are always this: diff --git a/Lib/lib2to3/pytree.py b/Lib/lib2to3/pytree.py index 100232b61c0..fa4942f3921 100644 --- a/Lib/lib2to3/pytree.py +++ b/Lib/lib2to3/pytree.py @@ -658,8 +658,8 @@ class WildcardPattern(BasePattern): content: optional sequence of subsequences of patterns; if absent, matches one node; if present, each subsequence is an alternative [*] - min: optinal minumum number of times to match, default 0 - max: optional maximum number of times tro match, default HUGE + min: optional minimum number of times to match, default 0 + max: optional maximum number of times to match, default HUGE name: optional name assigned to this match [*] Thus, if content is [[a, b, c], [d, e], [f, g, h]] this is diff --git a/Lib/lib2to3/tests/data/py2_test_grammar.py b/Lib/lib2to3/tests/data/py2_test_grammar.py index 17f9f4c51c0..b5a4137d161 100644 --- a/Lib/lib2to3/tests/data/py2_test_grammar.py +++ b/Lib/lib2to3/tests/data/py2_test_grammar.py @@ -316,7 +316,7 @@ class GrammarTests(unittest.TestCase): ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo(): - # verify statments that end with semi-colons + # verify statements that end with semi-colons x = 1; pass; del x; foo() diff --git a/Lib/lib2to3/tests/data/py3_test_grammar.py b/Lib/lib2to3/tests/data/py3_test_grammar.py index 977f0b8b35f..c0bf7f27aa5 100644 --- a/Lib/lib2to3/tests/data/py3_test_grammar.py +++ b/Lib/lib2to3/tests/data/py3_test_grammar.py @@ -356,7 +356,7 @@ class GrammarTests(unittest.TestCase): ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo(): - # verify statments that end with semi-colons + # verify statements that end with semi-colons x = 1; pass; del x; foo() diff --git a/Lib/ntpath.py b/Lib/ntpath.py index 9e4cff7a6c0..ae9dcf2eafe 100644 --- a/Lib/ntpath.py +++ b/Lib/ntpath.py @@ -389,7 +389,7 @@ def expanduser(path): # - $varname is accepted. # - %varname% is accepted. # - varnames can be made out of letters, digits and the characters '_-' -# (though is not verifed in the ${varname} and %varname% cases) +# (though is not verified in the ${varname} and %varname% cases) # XXX With COMMAND.COM you can use any characters in a variable name, # XXX except '^|<>='. diff --git a/Lib/pickletools.py b/Lib/pickletools.py index dc408101dbc..0af2fdba132 100644 --- a/Lib/pickletools.py +++ b/Lib/pickletools.py @@ -1406,7 +1406,7 @@ opcodes = [ proto=0, doc="""Read an object from the memo and push it on the stack. - The index of the memo object to push is given by the newline-teriminated + The index of the memo object to push is given by the newline-terminated decimal string following. BINGET and LONG_BINGET are space-optimized versions. """), diff --git a/Lib/platform.py b/Lib/platform.py index 780301d264f..2294604ea41 100755 --- a/Lib/platform.py +++ b/Lib/platform.py @@ -476,7 +476,7 @@ def _syscmd_ver(system='', release='', version='', info = pipe.read() if pipe.close(): raise os.error('command failed') - # XXX How can I supress shell errors from being written + # XXX How can I suppress shell errors from being written # to stderr ? except os.error as why: #print 'Command %s failed: %s' % (cmd,why) diff --git a/Lib/pstats.py b/Lib/pstats.py index db16628adc7..566272dcae7 100644 --- a/Lib/pstats.py +++ b/Lib/pstats.py @@ -71,7 +71,7 @@ class Stats: """ def __init__(self, *args, **kwds): - # I can't figure out how to explictly specify a stream keyword arg + # I can't figure out how to explicitly specify a stream keyword arg # with *args: # def __init__(self, *args, stream=sys.stdout): ... # so I use **kwds and sqauwk if something unexpected is passed in. diff --git a/Lib/subprocess.py b/Lib/subprocess.py index b8e3c0e4c85..97792dbe605 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -858,7 +858,7 @@ class Popen(object): except pywintypes.error as e: # Translate pywintypes.error to WindowsError, which is # a subclass of OSError. FIXME: We should really - # translate errno using _sys_errlist (or simliar), but + # translate errno using _sys_errlist (or similar), but # how can this be done from Python? raise WindowsError(*e.args) finally: diff --git a/Lib/test/pyclbr_input.py b/Lib/test/pyclbr_input.py index 8efc9de75d7..19ccd62dead 100644 --- a/Lib/test/pyclbr_input.py +++ b/Lib/test/pyclbr_input.py @@ -19,7 +19,7 @@ class C (B): # XXX: This causes test_pyclbr.py to fail, but only because the # introspection-based is_method() code in the test can't - # distinguish between this and a geniune method function like m(). + # distinguish between this and a genuine method function like m(). # The pyclbr.py module gets this right as it parses the text. # #f = f diff --git a/Lib/test/test_capi.py b/Lib/test/test_capi.py index 0460679c7bb..3f1d63c4903 100644 --- a/Lib/test/test_capi.py +++ b/Lib/test/test_capi.py @@ -106,7 +106,7 @@ class TestPendingCalls(unittest.TestCase): context.event.set() def test_pendingcalls_non_threaded(self): - #again, just using the main thread, likely they will all be dispathced at + #again, just using the main thread, likely they will all be dispatched at #once. It is ok to ask for too many, because we loop until we find a slot. #the loop can be interrupted to dispatch. #there are only 32 dispatch slots, so we go for twice that! diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py index d983d6e566d..ea1e4d51b61 100644 --- a/Lib/test/test_datetime.py +++ b/Lib/test/test_datetime.py @@ -3120,7 +3120,7 @@ class TestTimezoneConversions(unittest.TestCase): self.assertEqual(dt, there_and_back) # Because we have a redundant spelling when DST begins, there is - # (unforunately) an hour when DST ends that can't be spelled at all in + # (unfortunately) an hour when DST ends that can't be spelled at all in # local time. When DST ends, the clock jumps from 1:59 back to 1:00 # again. The hour 1:MM DST has no spelling then: 1:MM is taken to be # standard time. 1:MM DST == 0:MM EST, but 0:MM is taken to be diff --git a/Lib/test/test_decimal.py b/Lib/test/test_decimal.py index 9467191a699..ec381e41395 100644 --- a/Lib/test/test_decimal.py +++ b/Lib/test/test_decimal.py @@ -225,7 +225,7 @@ class DecimalTest(unittest.TestCase): try: t = self.eval_line(line) except DecimalException as exception: - #Exception raised where there shoudn't have been one. + #Exception raised where there shouldn't have been one. self.fail('Exception "'+exception.__class__.__name__ + '" raised on line '+line) return diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index 6b9e30d13f8..bd88f453377 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -3976,7 +3976,7 @@ order (MRO) for bases """ except TypeError: pass else: - self.fail("Carlo Verre __setattr__ suceeded!") + self.fail("Carlo Verre __setattr__ succeeded!") try: object.__delattr__(str, "lower") except TypeError: diff --git a/Lib/test/test_doctest.py b/Lib/test/test_doctest.py index 0cb4f189bf9..de85758ac50 100644 --- a/Lib/test/test_doctest.py +++ b/Lib/test/test_doctest.py @@ -1222,7 +1222,7 @@ marking, as well as interline differences. ? + ++ ^ TestResults(failed=1, attempted=1) -The REPORT_ONLY_FIRST_FAILURE supresses result output after the first +The REPORT_ONLY_FIRST_FAILURE suppresses result output after the first failing example: >>> def f(x): @@ -1252,7 +1252,7 @@ failing example: 2 TestResults(failed=3, attempted=5) -However, output from `report_start` is not supressed: +However, output from `report_start` is not suppressed: >>> doctest.DocTestRunner(verbose=True, optionflags=flags).run(test) ... # doctest: +ELLIPSIS @@ -2199,7 +2199,7 @@ We don't want `-v` in sys.argv for these tests. >>> doctest.master = None # Reset master. (Note: we'll be clearing doctest.master after each call to -`doctest.testfile`, to supress warnings about multiple tests with the +`doctest.testfile`, to suppress warnings about multiple tests with the same name.) Globals may be specified with the `globs` and `extraglobs` parameters: @@ -2235,7 +2235,7 @@ optional `module_relative` parameter: TestResults(failed=0, attempted=2) >>> doctest.master = None # Reset master. -Verbosity can be increased with the optional `verbose` paremter: +Verbosity can be increased with the optional `verbose` parameter: >>> doctest.testfile('test_doctest.txt', globs=globs, verbose=True) Trying: @@ -2272,7 +2272,7 @@ parameter: TestResults(failed=1, attempted=2) >>> doctest.master = None # Reset master. -The summary report may be supressed with the optional `report` +The summary report may be suppressed with the optional `report` parameter: >>> doctest.testfile('test_doctest.txt', report=False) diff --git a/Lib/test/test_extcall.py b/Lib/test/test_extcall.py index f1fff0a5eca..ce9ac5ea023 100644 --- a/Lib/test/test_extcall.py +++ b/Lib/test/test_extcall.py @@ -227,7 +227,7 @@ Another helper function >>> Foo.method(1, *[2, 3]) 5 -A PyCFunction that takes only positional parameters shoud allow an +A PyCFunction that takes only positional parameters should allow an empty keyword dictionary to pass without a complaint, but raise a TypeError if te dictionary is not empty diff --git a/Lib/test/test_float.py b/Lib/test/test_float.py index b5b6b658590..2b250df75f2 100644 --- a/Lib/test/test_float.py +++ b/Lib/test/test_float.py @@ -121,7 +121,7 @@ class GeneralFloatCases(unittest.TestCase): def test_float_with_comma(self): # set locale to something that doesn't use '.' for the decimal point # float must not accept the locale specific decimal point but - # it still has to accept the normal python syntac + # it still has to accept the normal python syntax import locale if not locale.localeconv()['decimal_point'] == ',': return @@ -243,7 +243,7 @@ class GeneralFloatCases(unittest.TestCase): def assertEqualAndEqualSign(self, a, b): # fail unless a == b and a and b have the same sign bit; # the only difference from assertEqual is that this test - # distingishes -0.0 and 0.0. + # distinguishes -0.0 and 0.0. self.assertEqual((a, copysign(1.0, a)), (b, copysign(1.0, b))) @requires_IEEE_754 diff --git a/Lib/test/test_grammar.py b/Lib/test/test_grammar.py index ff8dc937786..df224fd3300 100644 --- a/Lib/test/test_grammar.py +++ b/Lib/test/test_grammar.py @@ -356,7 +356,7 @@ class GrammarTests(unittest.TestCase): ### simple_stmt: small_stmt (';' small_stmt)* [';'] x = 1; pass; del x def foo(): - # verify statments that end with semi-colons + # verify statements that end with semi-colons x = 1; pass; del x; foo() diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py index 4f1ecff4a91..28256975a0e 100644 --- a/Lib/test/test_httpservers.py +++ b/Lib/test/test_httpservers.py @@ -83,7 +83,7 @@ class BaseTestCase(unittest.TestCase): return self.connection.getresponse() class BaseHTTPRequestHandlerTestCase(unittest.TestCase): - """Test the functionaility of the BaseHTTPServer.""" + """Test the functionality of the BaseHTTPServer.""" HTTPResponseMatch = re.compile(b'HTTP/1.[0-9]+ 200 OK') diff --git a/Lib/test/test_iterlen.py b/Lib/test/test_iterlen.py index cd928013f56..7469a319f7a 100644 --- a/Lib/test/test_iterlen.py +++ b/Lib/test/test_iterlen.py @@ -20,11 +20,11 @@ This is the case for tuples, range objects, and itertools.repeat(). Some containers become temporarily immutable during iteration. This includes dicts, sets, and collections.deque. Their implementation is equally simple -though they need to permantently set their length to zero whenever there is +though they need to permanently set their length to zero whenever there is an attempt to iterate after a length mutation. The situation slightly more involved whenever an object allows length mutation -during iteration. Lists and sequence iterators are dynanamically updatable. +during iteration. Lists and sequence iterators are dynamically updatable. So, if a list is extended during iteration, the iterator will continue through the new items. If it shrinks to a point before the most recent iteration, then no further items are available and the length is reported at zero. diff --git a/Lib/test/test_itertools.py b/Lib/test/test_itertools.py index a1875ffda4a..da101e11abf 100644 --- a/Lib/test/test_itertools.py +++ b/Lib/test/test_itertools.py @@ -1490,7 +1490,7 @@ Samuele ... return chain(iterable, repeat(None)) >>> def ncycles(iterable, n): -... "Returns the seqeuence elements n times" +... "Returns the sequence elements n times" ... return chain(*repeat(iterable, n)) >>> def dotproduct(vec1, vec2): diff --git a/Lib/test/test_marshal.py b/Lib/test/test_marshal.py index 20f53b8d7ac..5e1cdd50525 100644 --- a/Lib/test/test_marshal.py +++ b/Lib/test/test_marshal.py @@ -200,7 +200,7 @@ class BugsTestCase(unittest.TestCase): # >>> type(loads(dumps(Int()))) # for typ in (int, float, complex, tuple, list, dict, set, frozenset): - # Note: str sublclasses are not tested because they get handled + # Note: str subclasses are not tested because they get handled # by marshal's routines for objects supporting the buffer API. subtyp = type('subtyp', (typ,), {}) self.assertRaises(ValueError, marshal.dumps, subtyp()) diff --git a/Lib/test/test_math.py b/Lib/test/test_math.py index e53bf2e3a90..9a87d5d3079 100644 --- a/Lib/test/test_math.py +++ b/Lib/test/test_math.py @@ -697,7 +697,7 @@ class MathTests(unittest.TestCase): # the following tests have been commented out since they don't # really belong here: the implementation of ** for floats is - # independent of the implemention of math.pow + # independent of the implementation of math.pow #self.assertEqual(1**NAN, 1) #self.assertEqual(1**INF, 1) #self.assertEqual(1**NINF, 1) diff --git a/Lib/test/test_mmap.py b/Lib/test/test_mmap.py index 0822cc12c31..7c51085a997 100644 --- a/Lib/test/test_mmap.py +++ b/Lib/test/test_mmap.py @@ -599,7 +599,7 @@ class MmapTests(unittest.TestCase): m2.close() m1.close() - # Test differnt tag + # Test different tag m1 = mmap.mmap(-1, len(data1), tagname="foo") m1[:] = data1 m2 = mmap.mmap(-1, len(data2), tagname="boo") diff --git a/Lib/test/test_multiprocessing.py b/Lib/test/test_multiprocessing.py index aa0e1d8ba7d..d1ac4b7c44c 100644 --- a/Lib/test/test_multiprocessing.py +++ b/Lib/test/test_multiprocessing.py @@ -780,7 +780,7 @@ class _TestEvent(BaseTestCase): event = self.Event() wait = TimingWrapper(event.wait) - # Removed temporaily, due to API shear, this does not + # Removed temporarily, due to API shear, this does not # work with threading._Event objects. is_set == isSet self.assertEqual(event.is_set(), False) @@ -1671,7 +1671,7 @@ class _TestFinalize(BaseTestCase): util.Finalize(None, conn.send, args=('STOP',), exitpriority=-100) - # call mutliprocessing's cleanup function then exit process without + # call multiprocessing's cleanup function then exit process without # garbage collecting locals util._exit_function() conn.close() diff --git a/Lib/test/test_pkg.py b/Lib/test/test_pkg.py index 2e293f4fbe5..4b48c043075 100644 --- a/Lib/test/test_pkg.py +++ b/Lib/test/test_pkg.py @@ -55,7 +55,7 @@ class TestPkg(unittest.TestCase): support.modules_cleanup(*self.modules_before) cleanout(self.root) - # delete all modules concerning the tested hiearchy + # delete all modules concerning the tested hierarchy if self.pkgname: modules = [name for name in sys.modules if self.pkgname in name.split('.')] diff --git a/Lib/test/test_print.py b/Lib/test/test_print.py index f157bc7db63..b1ace4dc2ce 100644 --- a/Lib/test/test_print.py +++ b/Lib/test/test_print.py @@ -21,7 +21,7 @@ NotDefined = object() # A dispatch table all 8 combinations of providing # sep, end, and file # I use this machinery so that I'm not just passing default -# values to print, I'm eiher passing or not passing in the +# values to print, I'm either passing or not passing in the # arguments dispatch = { (False, False, False): diff --git a/Lib/test/test_strlit.py b/Lib/test/test_strlit.py index 23d96f867a8..9eb30e9c54b 100644 --- a/Lib/test/test_strlit.py +++ b/Lib/test/test_strlit.py @@ -22,7 +22,7 @@ We have to test this with various file encodings. We also test it with exec()/eval(), which uses a different code path. This file is really about correct treatment of encodings and -backslashes. It doens't concern itself with issues like single +backslashes. It doesn't concern itself with issues like single vs. double quotes or singly- vs. triply-quoted strings: that's dealt with elsewhere (I assume). """ diff --git a/Lib/test/test_strptime.py b/Lib/test/test_strptime.py index e0263b4f1a5..f150546287d 100644 --- a/Lib/test/test_strptime.py +++ b/Lib/test/test_strptime.py @@ -541,7 +541,7 @@ class CacheTests(unittest.TestCase): self.assertIsNot(first_time_re, second_time_re) # Possible test locale is not supported while initial locale is. # If this is the case just suppress the exception and fall-through - # to the reseting to the original locale. + # to the resetting to the original locale. except locale.Error: pass # Make sure we don't trample on the locale setting once we leave the diff --git a/Lib/test/test_struct.py b/Lib/test/test_struct.py index 0c193269210..9ed3220e8b7 100644 --- a/Lib/test/test_struct.py +++ b/Lib/test/test_struct.py @@ -476,7 +476,7 @@ class StructTest(unittest.TestCase): test_string) def test_unpack_with_buffer(self): - # SF bug 1563759: struct.unpack doens't support buffer protocol objects + # SF bug 1563759: struct.unpack doesn't support buffer protocol objects data1 = array.array('B', b'\x12\x34\x56\x78') data2 = memoryview(b'\x12\x34\x56\x78') # XXX b'......XXXX......', 6, 4 for data in [data1, data2]: diff --git a/Lib/test/test_syntax.py b/Lib/test/test_syntax.py index 2afbb617640..202770afa6d 100644 --- a/Lib/test/test_syntax.py +++ b/Lib/test/test_syntax.py @@ -237,7 +237,7 @@ SyntaxError: can't assign to function call Test continue in finally in weird combinations. -continue in for loop under finally shouuld be ok. +continue in for loop under finally should be ok. >>> def test(): ... try: diff --git a/Lib/test/test_sys.py b/Lib/test/test_sys.py index aa30923fe16..11685a42023 100644 --- a/Lib/test/test_sys.py +++ b/Lib/test/test_sys.py @@ -416,7 +416,7 @@ class SysModuleTest(unittest.TestCase): # provide too much opportunity for insane things to happen. # We don't want them in the interned dict and if they aren't # actually interned, we don't want to create the appearance - # that they are by allowing intern() to succeeed. + # that they are by allowing intern() to succeed. class S(str): def __hash__(self): return 123 diff --git a/Lib/test/test_threading.py b/Lib/test/test_threading.py index 2bf84374a74..f977a7fbbee 100644 --- a/Lib/test/test_threading.py +++ b/Lib/test/test_threading.py @@ -543,7 +543,7 @@ class ThreadJoinOnShutdown(unittest.TestCase): # This acquires the lock and then waits until the child has forked # before returning, which will release the lock soon after. If # someone else tries to fix this test case by acquiring this lock - # before forking instead of reseting it, the test case will + # before forking instead of resetting it, the test case will # deadlock when it shouldn't. condition = w._block orig_acquire = condition.acquire diff --git a/Lib/test/test_trace.py b/Lib/test/test_trace.py index 07c5062f93c..3697cbf5bb3 100644 --- a/Lib/test/test_trace.py +++ b/Lib/test/test_trace.py @@ -185,7 +185,7 @@ class TestRunExecCounts(unittest.TestCase): (self.my_py_filename, firstlineno + 4): 1, } - # When used through 'run', some other spurios counts are produced, like + # When used through 'run', some other spurious counts are produced, like # the settrace of threading, which we ignore, just making sure that the # counts fo traced_func_loop were right. # diff --git a/Lib/test/test_urllib.py b/Lib/test/test_urllib.py index 2a9590a8c3e..422831e35fa 100644 --- a/Lib/test/test_urllib.py +++ b/Lib/test/test_urllib.py @@ -1003,7 +1003,7 @@ class URLopener_Tests(unittest.TestCase): # Just commented them out. # Can't really tell why keep failing in windows and sparc. -# Everywhere else they work ok, but on those machines, someteimes +# Everywhere else they work ok, but on those machines, sometimes # fail in one of the tests, sometimes in other. I have a linux, and # the tests go ok. # If anybody has one of the problematic enviroments, please help! diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py index 77f5be033a7..65a1a287269 100644 --- a/Lib/test/test_warnings.py +++ b/Lib/test/test_warnings.py @@ -333,7 +333,7 @@ class WarnTests(unittest.TestCase): sys.argv = argv def test_warn_explicit_type_errors(self): - # warn_explicit() shoud error out gracefully if it is given objects + # warn_explicit() should error out gracefully if it is given objects # of the wrong types. # lineno is expected to be an integer. self.assertRaises(TypeError, self.module.warn_explicit, diff --git a/Lib/tkinter/test/test_ttk/test_functions.py b/Lib/tkinter/test/test_ttk/test_functions.py index f9b908e5e48..df593cd7109 100644 --- a/Lib/tkinter/test/test_ttk/test_functions.py +++ b/Lib/tkinter/test/test_ttk/test_functions.py @@ -135,7 +135,7 @@ class InternalFunctionsTest(unittest.TestCase): # minimum acceptable for image type self.assertEqual(ttk._format_elemcreate('image', False, 'test'), ("test ", ())) - # specifiyng a state spec + # specifying a state spec self.assertEqual(ttk._format_elemcreate('image', False, 'test', ('', 'a')), ("test {} a", ())) # state spec with multiple states diff --git a/Lib/tkinter/tix.py b/Lib/tkinter/tix.py index 6458797e335..b105278b970 100644 --- a/Lib/tkinter/tix.py +++ b/Lib/tkinter/tix.py @@ -156,7 +156,7 @@ class tixCommand: return self.tk.call('tix', 'getimage', name) def tix_option_get(self, name): - """Gets the options manitained by the Tix + """Gets the options maintained by the Tix scheme mechanism. Available options include: active_bg active_fg bg @@ -561,7 +561,7 @@ class ButtonBox(TixWidget): class ComboBox(TixWidget): """ComboBox - an Entry field with a dropdown menu. The user can select a - choice by either typing in the entry subwdget or selecting from the + choice by either typing in the entry subwidget or selecting from the listbox subwidget. Subwidget Class @@ -854,7 +854,7 @@ class HList(TixWidget): """HList - Hierarchy display widget can be used to display any data that have a hierarchical structure, for example, file system directory trees. The list entries are indented and connected by branch lines - according to their places in the hierachy. + according to their places in the hierarchy. Subwidgets - None""" @@ -1509,7 +1509,7 @@ class TList(TixWidget): self.tk.call(self._w, 'yview', *args) class Tree(TixWidget): - """Tree - The tixTree widget can be used to display hierachical + """Tree - The tixTree widget can be used to display hierarchical data in a tree form. The user can adjust the view of the tree by opening or closing parts of the tree.""" diff --git a/Lib/tkinter/ttk.py b/Lib/tkinter/ttk.py index 1c7f11a35b9..9213b62bc79 100644 --- a/Lib/tkinter/ttk.py +++ b/Lib/tkinter/ttk.py @@ -707,7 +707,7 @@ class Combobox(Entry): textvariable, values, width """ # The "values" option may need special formatting, so leave to - # _format_optdict the responsability to format it + # _format_optdict the responsibility to format it if "values" in kw: kw["values"] = _format_optdict({'v': kw["values"]})[1] diff --git a/Lib/turtle.py b/Lib/turtle.py index 8146be6aa4a..0c439f1e3ba 100644 --- a/Lib/turtle.py +++ b/Lib/turtle.py @@ -1488,7 +1488,7 @@ class TurtleScreen(TurtleScreenBase): Optional arguments: canvwidth -- positive integer, new width of canvas in pixels canvheight -- positive integer, new height of canvas in pixels - bg -- colorstring or color-tupel, new backgroundcolor + bg -- colorstring or color-tuple, new backgroundcolor If no arguments are given, return current (canvaswidth, canvasheight) Do not alter the drawing window. To observe hidden parts of @@ -3242,9 +3242,9 @@ class RawTurtle(TPen, TNavigator): fill="", width=ps) # Turtle now at position old, self._position = old - ## if undo is done during crating a polygon, the last vertex - ## will be deleted. if the polygon is entirel deleted, - ## creatigPoly will be set to False. + ## if undo is done during creating a polygon, the last vertex + ## will be deleted. if the polygon is entirely deleted, + ## creatingPoly will be set to False. ## Polygons created before the last one will not be affected by undo() if self._creatingPoly: if len(self._poly) > 0: @@ -3796,7 +3796,7 @@ class _Screen(TurtleScreen): class Turtle(RawTurtle): - """RawTurtle auto-crating (scrolled) canvas. + """RawTurtle auto-creating (scrolled) canvas. When a Turtle object is created or a function derived from some Turtle method is called a TurtleScreen object is automatically created. @@ -3836,7 +3836,7 @@ def write_docstringdict(filename="turtle_docstringdict"): filename -- a string, used as filename default value is turtle_docstringdict - Has to be called explicitely, (not used by the turtle-graphics classes) + Has to be called explicitly, (not used by the turtle-graphics classes) The docstring dictionary will be written to the Python script .py It is intended to serve as a template for translation of the docstrings into different languages. diff --git a/Lib/xml/dom/minicompat.py b/Lib/xml/dom/minicompat.py index 2e6cc7e34c0..62725c6198d 100644 --- a/Lib/xml/dom/minicompat.py +++ b/Lib/xml/dom/minicompat.py @@ -6,7 +6,7 @@ # # NodeList -- lightest possible NodeList implementation # -# EmptyNodeList -- lightest possible NodeList that is guarateed to +# EmptyNodeList -- lightest possible NodeList that is guaranteed to # remain empty (immutable) # # StringTypes -- tuple of defined string types diff --git a/Lib/xml/dom/minidom.py b/Lib/xml/dom/minidom.py index bc68cf89335..d9c04d48ade 100644 --- a/Lib/xml/dom/minidom.py +++ b/Lib/xml/dom/minidom.py @@ -1893,7 +1893,7 @@ def _clone_node(node, deep, newOwnerDocument): e._call_user_data_handler(operation, n, entity) else: # Note the cloning of Document and DocumentType nodes is - # implemenetation specific. minidom handles those cases + # implementation specific. minidom handles those cases # directly in the cloneNode() methods. raise xml.dom.NotSupportedErr("Cannot clone node %s" % repr(node)) diff --git a/Lib/xmlrpc/server.py b/Lib/xmlrpc/server.py index 1cd45a95964..24d8a6a03e3 100644 --- a/Lib/xmlrpc/server.py +++ b/Lib/xmlrpc/server.py @@ -239,7 +239,7 @@ class SimpleXMLRPCDispatcher: marshalled data. For backwards compatibility, a dispatch function can be provided as an argument (see comment in SimpleXMLRPCRequestHandler.do_POST) but overriding the - existing method through subclassing is the prefered means + existing method through subclassing is the preferred means of changing method dispatch behavior. """ diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 08e64d99fe8..02dbe1347e1 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -354,7 +354,7 @@ def fileContents(fn): def runCommand(commandline): """ - Run a command and raise RuntimeError if it fails. Output is surpressed + Run a command and raise RuntimeError if it fails. Output is suppressed unless the command fails. """ fd = os.popen(commandline, 'r') diff --git a/Modules/_ctypes/_ctypes.c b/Modules/_ctypes/_ctypes.c index 5643a659f33..04b07cc4e2d 100644 --- a/Modules/_ctypes/_ctypes.c +++ b/Modules/_ctypes/_ctypes.c @@ -3331,7 +3331,7 @@ PyCFuncPtr_new(PyTypeObject *type, PyObject *args, PyObject *kwds) /* XXX XXX This would allow to pass additional options. For COM method *implementations*, we would probably want different behaviour than in 'normal' callback functions: return a HRESULT if - an exception occurrs in the callback, and print the traceback not + an exception occurs in the callback, and print the traceback not only on the console, but also to OutputDebugString() or something like that. */ diff --git a/Modules/_ctypes/callbacks.c b/Modules/_ctypes/callbacks.c index 5c82f77c581..490ada6248c 100644 --- a/Modules/_ctypes/callbacks.c +++ b/Modules/_ctypes/callbacks.c @@ -234,7 +234,7 @@ static void _CallPythonObject(void *mem, /* XXX XXX XX We have the problem that c_byte or c_short have dict->size of 1 resp. 4, but these parameters are pushed as sizeof(int) bytes. - BTW, the same problem occurrs when they are pushed as parameters + BTW, the same problem occurs when they are pushed as parameters */ } else if (dict) { /* Hm, shouldn't we use PyCData_AtAddress() or something like that instead? */ diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index d185fdaf390..41a90f66475 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -29,7 +29,7 @@ 4. _ctypes_callproc is then called with the 'callargs' tuple. _ctypes_callproc first allocates two arrays. The first is an array of 'struct argument' items, the - second array has 'void *' entried. + second array has 'void *' entries. 5. If 'converters' are present (converters is a sequence of argtypes' from_param methods), for each item in 'callargs' converter is called and the diff --git a/Modules/_functoolsmodule.c b/Modules/_functoolsmodule.c index 34373539336..9aaa0f39943 100644 --- a/Modules/_functoolsmodule.c +++ b/Modules/_functoolsmodule.c @@ -200,7 +200,7 @@ static PyGetSetDef partial_getsetlist[] = { __reduce__ by itself doesn't support getting kwargs in the unpickle operation so we define a __setstate__ that replaces all the information about the partial. If we only replaced part of it someone would use - it as a hook to do stange things. + it as a hook to do strange things. */ static PyObject * diff --git a/Modules/_io/iobase.c b/Modules/_io/iobase.c index dfc1a3ad5df..84b560a0297 100644 --- a/Modules/_io/iobase.c +++ b/Modules/_io/iobase.c @@ -49,7 +49,7 @@ PyDoc_STRVAR(iobase_doc, "stream.\n" "\n" "IOBase also supports the :keyword:`with` statement. In this example,\n" - "fp is closed after the suite of the with statment is complete:\n" + "fp is closed after the suite of the with statement is complete:\n" "\n" "with open('spam.txt', 'r') as fp:\n" " fp.write('Spam and eggs!')\n"); diff --git a/Modules/_io/stringio.c b/Modules/_io/stringio.c index 7e3730a7371..8d83f73078d 100644 --- a/Modules/_io/stringio.c +++ b/Modules/_io/stringio.c @@ -157,7 +157,7 @@ write_str(stringio *self, PyObject *obj) 0 lo string_size hi | |<---used--->|<----------available----------->| | | <--to pad-->|<---to write---> | - 0 buf positon + 0 buf position */ memset(self->buf + self->string_size, '\0', diff --git a/Modules/_pickle.c b/Modules/_pickle.c index 4eb74ffe04f..5102e2491d2 100644 --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -4874,7 +4874,7 @@ initmodule(void) goto error; if (!PyDict_CheckExact(name_mapping_3to2)) { PyErr_Format(PyExc_RuntimeError, - "_compat_pickle.REVERSE_NAME_MAPPING shouldbe a dict, " + "_compat_pickle.REVERSE_NAME_MAPPING should be a dict, " "not %.200s", Py_TYPE(name_mapping_3to2)->tp_name); goto error; } diff --git a/Modules/_sqlite/connection.h b/Modules/_sqlite/connection.h index af414a0c389..fe05297f366 100644 --- a/Modules/_sqlite/connection.h +++ b/Modules/_sqlite/connection.h @@ -55,7 +55,7 @@ typedef struct /* None for autocommit, otherwise a PyString with the isolation level */ PyObject* isolation_level; - /* NULL for autocommit, otherwise a string with the BEGIN statment; will be + /* NULL for autocommit, otherwise a string with the BEGIN statement; will be * freed in connection destructor */ char* begin_statement; diff --git a/Modules/cmathmodule.c b/Modules/cmathmodule.c index 545e834cccc..592b4ea4a20 100644 --- a/Modules/cmathmodule.c +++ b/Modules/cmathmodule.c @@ -22,7 +22,7 @@ /* CM_LARGE_DOUBLE is used to avoid spurious overflow in the sqrt, log, inverse trig and inverse hyperbolic trig functions. Its log is used in the - evaluation of exp, cos, cosh, sin, sinh, tan, and tanh to avoid unecessary + evaluation of exp, cos, cosh, sin, sinh, tan, and tanh to avoid unnecessary overflow. */ diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c index 9bdca0c0a29..b04d246f1d0 100644 --- a/Modules/socketmodule.c +++ b/Modules/socketmodule.c @@ -2151,7 +2151,7 @@ will allow before refusing new connections."); * This is the guts of the recv() and recv_into() methods, which reads into a * char buffer. If you have any inc/dec ref to do to the objects that contain * the buffer, do it in the caller. This function returns the number of bytes - * succesfully read. If there was an error, it returns -1. Note that it is + * successfully read. If there was an error, it returns -1. Note that it is * also possible that we return a number of bytes smaller than the request * bytes. */ @@ -2350,7 +2350,7 @@ See recv() for documentation about the flags."); * This is the guts of the recvfrom() and recvfrom_into() methods, which reads * into a char buffer. If you have any inc/def ref to do to the objects that * contain the buffer, do it in the caller. This function returns the number - * of bytes succesfully read. If there was an error, it returns -1. Note + * of bytes successfully read. If there was an error, it returns -1. Note * that it is also possible that we return a number of bytes smaller than the * request bytes. * @@ -2443,9 +2443,9 @@ sock_recvfrom(PySocketSockObject *s, PyObject *args) if (outlen != recvlen) { /* We did not read as many bytes as we anticipated, resize the - string if possible and be succesful. */ + string if possible and be successful. */ if (_PyBytes_Resize(&buf, outlen) < 0) - /* Oopsy, not so succesful after all. */ + /* Oopsy, not so successful after all. */ goto finally; } @@ -4162,7 +4162,7 @@ os_init(void) return 0; /* Failure */ #else - /* No need to initialise sockets with GCC/EMX */ + /* No need to initialize sockets with GCC/EMX */ return 1; /* Success */ #endif } @@ -4195,7 +4195,7 @@ PySocketModule_APIObject PySocketModuleAPI = "socket.py" which implements some additional functionality. The import of "_socket" may fail with an ImportError exception if os-specific initialization fails. On Windows, this does WINSOCK - initialization. When WINSOCK is initialized succesfully, a call to + initialization. When WINSOCK is initialized successfully, a call to WSACleanup() is scheduled to be made at exit time. */ diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 8c40d21d501..a24728aeea0 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -706,7 +706,7 @@ time_mktime(PyObject *self, PyObject *tup) buf.tm_wday = -1; /* sentinel; original value ignored */ tt = mktime(&buf); /* Return value of -1 does not necessarily mean an error, but tm_wday - * cannot remain set to -1 if mktime succedded. */ + * cannot remain set to -1 if mktime succeeded. */ if (tt == (time_t)(-1) && buf.tm_wday == -1) { PyErr_SetString(PyExc_OverflowError, "mktime argument out of range"); diff --git a/Modules/zipimport.c b/Modules/zipimport.c index d3ca28dc17f..fb5f42b58a0 100644 --- a/Modules/zipimport.c +++ b/Modules/zipimport.c @@ -1049,7 +1049,7 @@ parse_dostime(int dostime, int dosdate) } /* Given a path to a .pyc or .pyo file in the archive, return the - modifictaion time of the matching .py file, or 0 if no source + modification time of the matching .py file, or 0 if no source is available. */ static time_t get_mtime_of_source(ZipImporter *self, char *path) diff --git a/Modules/zlib/deflate.h b/Modules/zlib/deflate.h index 05a5ab3a2c1..b16f7a77281 100644 --- a/Modules/zlib/deflate.h +++ b/Modules/zlib/deflate.h @@ -188,7 +188,7 @@ typedef struct internal_state { int nice_match; /* Stop searching when current match exceeds this */ /* used by trees.c: */ - /* Didn't use ct_data typedef below to supress compiler warning */ + /* Didn't use ct_data typedef below to suppress compiler warning */ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ diff --git a/Modules/zlib/gzio.c b/Modules/zlib/gzio.c index 7e90f4928fc..5cf50e04c40 100644 --- a/Modules/zlib/gzio.c +++ b/Modules/zlib/gzio.c @@ -256,7 +256,7 @@ int ZEXPORT gzsetparams (file, level, strategy) /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been sucessfully opened for reading. + IN assertion: the stream s has been successfully opened for reading. */ local int get_byte(s) gz_stream *s; @@ -281,7 +281,7 @@ local int get_byte(s) mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. - IN assertion: the stream s has already been created sucessfully; + IN assertion: the stream s has already been created successfully; s->stream.avail_in is zero for the first time, but may be non-zero for concatenated .gz files. */ diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 9c17be7a252..8492c618d82 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -2070,7 +2070,7 @@ dict_new(PyTypeObject *type, PyObject *args, PyObject *kwds) assert(d->ma_table == NULL && d->ma_fill == 0 && d->ma_used == 0); INIT_NONZERO_DICT_SLOTS(d); d->ma_lookup = lookdict_unicode; - /* The object has been implicitely tracked by tp_alloc */ + /* The object has been implicitly tracked by tp_alloc */ if (type == &PyDict_Type) _PyObject_GC_UNTRACK(d); #ifdef SHOW_CONVERSION_COUNTS diff --git a/Objects/listobject.c b/Objects/listobject.c index e8b21f133cf..b3bb21dbd0c 100644 --- a/Objects/listobject.c +++ b/Objects/listobject.c @@ -11,7 +11,7 @@ /* Ensure ob_item has room for at least newsize elements, and set * ob_size to newsize. If newsize > ob_size on entry, the content * of the new slots at exit is undefined heap trash; it's the caller's - * responsiblity to overwrite them with sane values. + * responsibility to overwrite them with sane values. * The number of allocated elements may grow, shrink, or stay the same. * Failure is impossible if newsize <= self.allocated on entry, although * that partly relies on an assumption that the system realloc() never diff --git a/Objects/longobject.c b/Objects/longobject.c index 7af5caf92e8..6f998ce0330 100644 --- a/Objects/longobject.c +++ b/Objects/longobject.c @@ -712,7 +712,7 @@ _PyLong_FromByteArray(const unsigned char* bytes, size_t n, is_signed = *pendbyte >= 0x80; /* Compute numsignificantbytes. This consists of finding the most - significant byte. Leading 0 bytes are insignficant if the number + significant byte. Leading 0 bytes are insignificant if the number is positive, and leading 0xff bytes if negative. */ { size_t i; @@ -3196,7 +3196,7 @@ long_true_divide(PyObject *a, PyObject *b) if (failed) return NULL; /* 'aexp' and 'bexp' were initialized to -1 to silence gcc-4.0.x, - but should really be set correctly after sucessful calls to + but should really be set correctly after successful calls to _PyLong_AsScaledDouble() */ assert(aexp >= 0 && bexp >= 0); diff --git a/Objects/typeobject.c b/Objects/typeobject.c index caa405b9455..310a56c4e5c 100644 --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1008,7 +1008,7 @@ subtype_dealloc(PyObject *self) self has a refcount of 0, and if gc ever gets its hands on it (which can happen if any weakref callback gets invoked), it looks like trash to gc too, and gc also tries to delete self - then. But we're already deleting self. Double dealloction is + then. But we're already deleting self. Double deallocation is a subtle disaster. Q. Why the bizarre (net-zero) manipulation of @@ -5872,7 +5872,7 @@ recurse_down_subclasses(PyTypeObject *type, PyObject *name, slots compete for the same descriptor (for example both sq_item and mp_subscript generate a __getitem__ descriptor). - In the latter case, the first slotdef entry encoutered wins. Since + In the latter case, the first slotdef entry encountered wins. Since slotdef entries are sorted by the offset of the slot in the PyHeapTypeObject, this gives us some control over disambiguating between competing slots: the members of PyHeapTypeObject are listed diff --git a/PC/bdist_wininst/extract.c b/PC/bdist_wininst/extract.c index fc2d2b970a1..c900f235fd9 100644 --- a/PC/bdist_wininst/extract.c +++ b/PC/bdist_wininst/extract.c @@ -54,7 +54,7 @@ BOOL ensure_directory(char *pathname, char *new_part, NOTIFYPROC notify) return TRUE; } -/* XXX Should better explicitely specify +/* XXX Should better explicitly specify * uncomp_size and file_times instead of pfhdr! */ char *map_new_file(DWORD flags, char *filename, @@ -164,7 +164,7 @@ extract_file(char *dst, char *src, int method, int comp_size, zstream.avail_out = uncomp_size; /* Apparently an undocumented feature of zlib: Set windowsize - to negative values to supress the gzip header and be compatible with + to negative values to suppress the gzip header and be compatible with zip! */ result = TRUE; if (Z_OK != (x = inflateInit2(&zstream, -15))) { diff --git a/PC/bdist_wininst/install.c b/PC/bdist_wininst/install.c index 8601ddd9f5a..771922cfd64 100644 --- a/PC/bdist_wininst/install.c +++ b/PC/bdist_wininst/install.c @@ -148,7 +148,7 @@ BOOL pyc_compile, pyo_compile; the permissions of the current user. */ HKEY hkey_root = (HKEY)-1; -BOOL success; /* Installation successfull? */ +BOOL success; /* Installation successful? */ char *failure_reason = NULL; HANDLE hBitmap; @@ -797,7 +797,7 @@ run_installscript(char *pathname, int argc, char **argv, char **pOutput) tempname = tempnam(NULL, NULL); // We use a static CRT while the Python version we load uses - // the CRT from one of various possibile DLLs. As a result we + // the CRT from one of various possible DLLs. As a result we // need to redirect the standard handles using the API rather // than the CRT. redirected = CreateFile( diff --git a/PC/os2emx/dlfcn.c b/PC/os2emx/dlfcn.c index 47c046ce727..ebda9cd94b5 100644 --- a/PC/os2emx/dlfcn.c +++ b/PC/os2emx/dlfcn.c @@ -188,7 +188,7 @@ inv_handle: return NULL; } -/* free dynamicaly-linked library */ +/* free dynamically-linked library */ int dlclose(void *handle) { int rc; diff --git a/PC/os2emx/dlfcn.h b/PC/os2emx/dlfcn.h index 49abecfbb53..f73ae695133 100644 --- a/PC/os2emx/dlfcn.h +++ b/PC/os2emx/dlfcn.h @@ -42,7 +42,7 @@ void *dlopen(char *filename, int flags); /* return a pointer to the `symbol' in DLL */ void *dlsym(void *handle, char *symbol); -/* free dynamicaly-linked library */ +/* free dynamically-linked library */ int dlclose(void *handle); /* return a string describing last occurred dl error */ diff --git a/Python/ceval.c b/Python/ceval.c index f3433f1d7dc..d3ed8717705 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -27,7 +27,7 @@ typedef unsigned long long uint64; -/* PowerPC suppport. +/* PowerPC support. "__ppc__" appears to be the preprocessor definition to detect on OS X, whereas "__powerpc__" appears to be the correct one for Linux with GCC */ @@ -1169,7 +1169,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) if (--_Py_Ticker < 0) { if (*next_instr == SETUP_FINALLY) { /* Make the last opcode before - a try: finally: block uninterruptable. */ + a try: finally: block uninterruptible. */ goto fast_next_opcode; } _Py_Ticker = _Py_CheckInterval; diff --git a/Python/pystate.c b/Python/pystate.c index f1eb6d97fac..ea0d05d8337 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -503,7 +503,7 @@ _PyThread_CurrentFrames(void) /* for i in all interpreters: * for t in all of i's thread states: * if t's frame isn't NULL, map t's id to its frame - * Because these lists can mutute even when the GIL is held, we + * Because these lists can mutate even when the GIL is held, we * need to grab head_mutex for the duration. */ HEAD_LOCK(); diff --git a/Python/thread.c b/Python/thread.c index b4e3ad0915f..4a9b4368ac1 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -46,7 +46,7 @@ #endif /* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then - enough of the Posix threads package is implimented to support python + enough of the Posix threads package is implemented to support python threads. This is valid for HP-UX 11.23 running on an ia64 system. If needed, add diff --git a/Tools/freeze/checkextensions_win32.py b/Tools/freeze/checkextensions_win32.py index ba3853c0be5..a41542f20ec 100644 --- a/Tools/freeze/checkextensions_win32.py +++ b/Tools/freeze/checkextensions_win32.py @@ -7,7 +7,7 @@ I dont consider it worth parsing the MSVC makefiles for compiler options. Even we get it just right, a specific freeze application may have specific compiler options anyway (eg, to enable or disable specific functionality) -So my basic stragtegy is: +So my basic strategy is: * Have some Windows INI files which "describe" one or more extension modules. (Freeze comes with a default one for all known modules - but you can specify diff --git a/Tools/scripts/fixcid.py b/Tools/scripts/fixcid.py index c9d3a295f21..b21a8365f22 100755 --- a/Tools/scripts/fixcid.py +++ b/Tools/scripts/fixcid.py @@ -188,7 +188,7 @@ def fix(filename): except os.error as msg: err(filename + ': rename failed (' + str(msg) + ')\n') return 1 - # Return succes + # Return success return 0 # Tokenizing ANSI C (partly) diff --git a/Tools/unicode/makeunicodedata.py b/Tools/unicode/makeunicodedata.py index 52cb3656e0c..c35170cac4c 100644 --- a/Tools/unicode/makeunicodedata.py +++ b/Tools/unicode/makeunicodedata.py @@ -866,7 +866,7 @@ class Hash: poly = size + poly break else: - raise AssertionError("ran out of polynominals") + raise AssertionError("ran out of polynomials") print(size, "slots in hash table") diff --git a/setup.py b/setup.py index 54400cbd6ad..51f8fde40aa 100644 --- a/setup.py +++ b/setup.py @@ -993,8 +993,8 @@ class PyBuildExt(build_ext): if sys.platform == 'darwin': # In every directory on the search path search for a dynamic # library and then a static library, instead of first looking - # for dynamic libraries on the entiry path. - # This way a staticly linked custom sqlite gets picked up + # for dynamic libraries on the entire path. + # This way a statically linked custom sqlite gets picked up # before the dynamic library in /usr/lib. sqlite_extra_link_args = ('-Wl,-search_paths_first',) else: From 9465d424ec2c880486514736c321f589878fa870 Mon Sep 17 00:00:00 2001 From: Ezio Melotti Date: Wed, 16 Mar 2011 12:48:54 +0200 Subject: [PATCH 05/30] Revert typo fixes in zlib/* --- Modules/zlib/deflate.h | 2 +- Modules/zlib/gzio.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/zlib/deflate.h b/Modules/zlib/deflate.h index b16f7a77281..05a5ab3a2c1 100644 --- a/Modules/zlib/deflate.h +++ b/Modules/zlib/deflate.h @@ -188,7 +188,7 @@ typedef struct internal_state { int nice_match; /* Stop searching when current match exceeds this */ /* used by trees.c: */ - /* Didn't use ct_data typedef below to suppress compiler warning */ + /* Didn't use ct_data typedef below to supress compiler warning */ struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ diff --git a/Modules/zlib/gzio.c b/Modules/zlib/gzio.c index 5cf50e04c40..7e90f4928fc 100644 --- a/Modules/zlib/gzio.c +++ b/Modules/zlib/gzio.c @@ -256,7 +256,7 @@ int ZEXPORT gzsetparams (file, level, strategy) /* =========================================================================== Read a byte from a gz_stream; update next_in and avail_in. Return EOF for end of file. - IN assertion: the stream s has been successfully opened for reading. + IN assertion: the stream s has been sucessfully opened for reading. */ local int get_byte(s) gz_stream *s; @@ -281,7 +281,7 @@ local int get_byte(s) mode to transparent if the gzip magic header is not present; set s->err to Z_DATA_ERROR if the magic header is present but the rest of the header is incorrect. - IN assertion: the stream s has already been created successfully; + IN assertion: the stream s has already been created sucessfully; s->stream.avail_in is zero for the first time, but may be non-zero for concatenated .gz files. */ From 0b8753d24b9a37834c23faa1da705f4ed222d928 Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 16 Mar 2011 09:41:32 -0400 Subject: [PATCH 06/30] Issue #11569: use absolute path to the sysctl command in multiprocessing to ensure that it will be found regardless of the shell PATH. This ensures that multiprocessing.cpu_count works on default installs of MacOSX. --- Lib/multiprocessing/__init__.py | 5 ++++- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Lib/multiprocessing/__init__.py b/Lib/multiprocessing/__init__.py index 28a5eecffd7..fdd012ea4ee 100644 --- a/Lib/multiprocessing/__init__.py +++ b/Lib/multiprocessing/__init__.py @@ -115,8 +115,11 @@ def cpu_count(): except (ValueError, KeyError): num = 0 elif 'bsd' in sys.platform or sys.platform == 'darwin': + comm = '/sbin/sysctl -n hw.ncpu' + if sys.platform == 'darwin': + comm = '/usr' + comm try: - with os.popen('sysctl -n hw.ncpu') as p: + with os.popen(comm) as p: num = int(p.read()) except ValueError: num = 0 diff --git a/Misc/ACKS b/Misc/ACKS index c7fd2ff9a03..e5ee8710b00 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -583,6 +583,7 @@ Tim Northover Joe Norton Neal Norwitz Michal Nowikowski +Steffen Daode Nurpmeso Nigel O'Brian Kevin O'Connor Tim O'Malley diff --git a/Misc/NEWS b/Misc/NEWS index c4627fac66a..d5c4699b68e 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,10 @@ Core and Builtins Library ------- +- Issue #11569: use absolute path to the sysctl command in multiprocessing to + ensure that it will be found regardless of the shell PATH. This ensures + that multiprocessing.cpu_count works on default installs of MacOSX. + - Issue #11501: disutils.archive_utils.make_zipfile no longer fails if zlib is not installed. Instead, the zipfile.ZIP_STORED compression is used to create the ZipFile. Patch by Natalia B. Bidart. From c1577902c62dd14e43ba37662a31d76addd4ac7e Mon Sep 17 00:00:00 2001 From: Ronald Oussoren Date: Wed, 16 Mar 2011 10:03:10 -0400 Subject: [PATCH 07/30] Fix typo in subprocess documentation. --- Doc/library/subprocess.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 6ea3c10dfc0..4a12b762275 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -387,7 +387,7 @@ All of the functions and methods that accept a *timeout* parameter, such as :func:`call` and :meth:`Popen.communicate` will raise :exc:`TimeoutExpired` if the timeout expires before the process exits. -Exceptions defined in this module all inherit from :ext:`SubprocessError`. +Exceptions defined in this module all inherit from :exc:`SubprocessError`. .. versionadded:: 3.3 The :exc:`SubprocessError` base class was added. From a78e4e6daf0b5623ce71966ef32a275ebce708fc Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 16 Mar 2011 10:29:19 -0500 Subject: [PATCH 08/30] correct patch ack (#11133) --- Misc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index bd21c5c71c8..ff5d7494fb8 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -41,7 +41,7 @@ Library ------- - Issue #11133: fix two cases where inspect.getattr_static can trigger code - execution. Patch by Daniel Urban. + execution. Patch by Andreas Stührk. - Issue #11569: use absolute path to the sysctl command in multiprocessing to ensure that it will be found regardless of the shell PATH. This ensures From ba102ec10d953af825e0da4c3cff02a701d3ca81 Mon Sep 17 00:00:00 2001 From: Ross Lagerwall Date: Wed, 16 Mar 2011 18:40:25 +0200 Subject: [PATCH 09/30] Issue #5870: Add subprocess.DEVNULL constant. --- Doc/library/subprocess.rst | 23 +++++++++++++++++------ Lib/subprocess.py | 23 ++++++++++++++++++++++- Lib/test/test_subprocess.py | 25 +++++++++++++++++++++++++ Misc/NEWS | 2 ++ 4 files changed, 66 insertions(+), 7 deletions(-) diff --git a/Doc/library/subprocess.rst b/Doc/library/subprocess.rst index 4a12b762275..88eb7846a3e 100644 --- a/Doc/library/subprocess.rst +++ b/Doc/library/subprocess.rst @@ -125,12 +125,14 @@ This module defines one class called :class:`Popen`: *stdin*, *stdout* and *stderr* specify the executed programs' standard input, standard output and standard error file handles, respectively. Valid values - are :data:`PIPE`, an existing file descriptor (a positive integer), an - existing :term:`file object`, and ``None``. :data:`PIPE` indicates that a - new pipe to the child should be created. With ``None``, no redirection will - occur; the child's file handles will be inherited from the parent. Additionally, - *stderr* can be :data:`STDOUT`, which indicates that the stderr data from the - applications should be captured into the same file handle as for stdout. + are :data:`PIPE`, :data:`DEVNULL`, an existing file descriptor (a positive + integer), an existing :term:`file object`, and ``None``. :data:`PIPE` + indicates that a new pipe to the child should be created. :data:`DEVNULL` + indicates that the special file :data:`os.devnull` will be used. With ``None``, + no redirection will occur; the child's file handles will be inherited from + the parent. Additionally, *stderr* can be :data:`STDOUT`, which indicates + that the stderr data from the applications should be captured into the same + file handle as for stdout. If *preexec_fn* is set to a callable object, this object will be called in the child process just before the child is executed. @@ -229,6 +231,15 @@ This module defines one class called :class:`Popen`: Added context manager support. +.. data:: DEVNULL + + Special value that can be used as the *stdin*, *stdout* or *stderr* argument + to :class:`Popen` and indicates that the special file :data:`os.devnull` + will be used. + + .. versionadded:: 3.3 + + .. data:: PIPE Special value that can be used as the *stdin*, *stdout* or *stderr* argument diff --git a/Lib/subprocess.py b/Lib/subprocess.py index cc0894544df..0e15f10c662 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -431,7 +431,7 @@ else: return fds __all__ = ["Popen", "PIPE", "STDOUT", "call", "check_call", "getstatusoutput", - "getoutput", "check_output", "CalledProcessError"] + "getoutput", "check_output", "CalledProcessError", "DEVNULL"] if mswindows: from _subprocess import CREATE_NEW_CONSOLE, CREATE_NEW_PROCESS_GROUP @@ -456,6 +456,7 @@ def _cleanup(): PIPE = -1 STDOUT = -2 +DEVNULL = -3 def _eintr_retry_call(func, *args): @@ -800,6 +801,10 @@ class Popen(object): # Child is still running, keep us alive until we can wait on it. _active.append(self) + def _get_devnull(self): + if not hasattr(self, '_devnull'): + self._devnull = os.open(os.devnull, os.O_RDWR) + return self._devnull def communicate(self, input=None, timeout=None): """Interact with process: Send data to stdin. Read data from @@ -889,6 +894,8 @@ class Popen(object): p2cread, _ = _subprocess.CreatePipe(None, 0) elif stdin == PIPE: p2cread, p2cwrite = _subprocess.CreatePipe(None, 0) + elif stdin == DEVNULL: + p2cread = msvcrt.get_osfhandle(self._get_devnull()) elif isinstance(stdin, int): p2cread = msvcrt.get_osfhandle(stdin) else: @@ -902,6 +909,8 @@ class Popen(object): _, c2pwrite = _subprocess.CreatePipe(None, 0) elif stdout == PIPE: c2pread, c2pwrite = _subprocess.CreatePipe(None, 0) + elif stdout == DEVNULL: + c2pwrite = msvcrt.get_osfhandle(self._get_devnull()) elif isinstance(stdout, int): c2pwrite = msvcrt.get_osfhandle(stdout) else: @@ -917,6 +926,8 @@ class Popen(object): errread, errwrite = _subprocess.CreatePipe(None, 0) elif stderr == STDOUT: errwrite = c2pwrite + elif stderr == DEVNULL: + errwrite = msvcrt.get_osfhandle(self._get_devnull()) elif isinstance(stderr, int): errwrite = msvcrt.get_osfhandle(stderr) else: @@ -1026,6 +1037,8 @@ class Popen(object): c2pwrite.Close() if errwrite != -1: errwrite.Close() + if hasattr(self, '_devnull'): + os.close(self._devnull) # Retain the process handle, but close the thread handle self._child_created = True @@ -1159,6 +1172,8 @@ class Popen(object): pass elif stdin == PIPE: p2cread, p2cwrite = _create_pipe() + elif stdin == DEVNULL: + p2cread = self._get_devnull() elif isinstance(stdin, int): p2cread = stdin else: @@ -1169,6 +1184,8 @@ class Popen(object): pass elif stdout == PIPE: c2pread, c2pwrite = _create_pipe() + elif stdout == DEVNULL: + c2pwrite = self._get_devnull() elif isinstance(stdout, int): c2pwrite = stdout else: @@ -1181,6 +1198,8 @@ class Popen(object): errread, errwrite = _create_pipe() elif stderr == STDOUT: errwrite = c2pwrite + elif stderr == DEVNULL: + errwrite = self._get_devnull() elif isinstance(stderr, int): errwrite = stderr else: @@ -1374,6 +1393,8 @@ class Popen(object): os.close(c2pwrite) if errwrite != -1 and errread != -1: os.close(errwrite) + if hasattr(self, '_devnull'): + os.close(self._devnull) # Wait for exec to fail or succeed; possibly raising an # exception (limited in size) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 5f158b9b64f..31565432b0c 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -323,6 +323,31 @@ class ProcessTestCase(BaseTestCase): rc = subprocess.call([sys.executable, "-c", cmd], stdout=1) self.assertEqual(rc, 2) + def test_stdout_devnull(self): + p = subprocess.Popen([sys.executable, "-c", + 'for i in range(10240):' + 'print("x" * 1024)'], + stdout=subprocess.DEVNULL) + p.wait() + self.assertEqual(p.stdout, None) + + def test_stderr_devnull(self): + p = subprocess.Popen([sys.executable, "-c", + 'import sys\n' + 'for i in range(10240):' + 'sys.stderr.write("x" * 1024)'], + stderr=subprocess.DEVNULL) + p.wait() + self.assertEqual(p.stderr, None) + + def test_stdin_devnull(self): + p = subprocess.Popen([sys.executable, "-c", + 'import sys;' + 'sys.stdin.read(1)'], + stdin=subprocess.DEVNULL) + p.wait() + self.assertEqual(p.stdin, None) + def test_cwd(self): tmpdir = tempfile.gettempdir() # We cannot use os.path.realpath to canonicalize the path, diff --git a/Misc/NEWS b/Misc/NEWS index a5d1bfe4db7..e3c04538ef6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -72,6 +72,8 @@ Core and Builtins Library ------- +- Issue #5870: Add `subprocess.DEVNULL` constant. + - Issue #11133: fix two cases where inspect.getattr_static can trigger code execution. Patch by Andreas Stührk. From abf202d798fec4cbe90a46d3fdba761ef6be0b85 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 13:52:20 -0400 Subject: [PATCH 10/30] Close #11548: Correctly handle format argument in shutil.unpack_archive --- Lib/shutil.py | 4 ++-- Lib/test/test_shutil.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Lib/shutil.py b/Lib/shutil.py index d47c67c6bcb..aafe04e7b1a 100644 --- a/Lib/shutil.py +++ b/Lib/shutil.py @@ -737,8 +737,8 @@ def unpack_archive(filename, extract_dir=None, format=None): except KeyError: raise ValueError("Unknown unpack format '{0}'".format(format)) - func = format_info[0] - func(filename, extract_dir, **dict(format_info[1])) + func = format_info[1] + func(filename, extract_dir, **dict(format_info[2])) else: # we need to look at the registered unpackers supported extensions format = _find_unpack_format(filename) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 30d9e07e35d..8d003a8f980 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -645,6 +645,14 @@ class TestShutil(unittest.TestCase): diff = self._compare_dirs(tmpdir, tmpdir2) self.assertEqual(diff, []) + # and again, this time with the format specified + tmpdir3 = self.mkdtemp() + unpack_archive(filename, tmpdir3, format=format) + diff = self._compare_dirs(tmpdir, tmpdir3) + self.assertEqual(diff, []) + self.assertRaises(shutil.ReadError, unpack_archive, TESTFN) + self.assertRaises(ValueError, unpack_archive, TESTFN, format='xxx') + def test_unpack_registery(self): formats = get_unpack_formats() From 8ed3cf3a4bdaab9d338667e37a262eba2aa52920 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 14:05:35 -0400 Subject: [PATCH 11/30] Close #11560: Improve test coverage of shutil --- Lib/test/test_shutil.py | 100 +++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 36 deletions(-) diff --git a/Lib/test/test_shutil.py b/Lib/test/test_shutil.py index 8d003a8f980..5252d4dff35 100644 --- a/Lib/test/test_shutil.py +++ b/Lib/test/test_shutil.py @@ -7,6 +7,7 @@ import sys import stat import os import os.path +import functools from test import support from test.support import TESTFN from os.path import splitdrive @@ -48,6 +49,21 @@ try: except ImportError: ZIP_SUPPORT = find_executable('zip') +def _fake_rename(*args, **kwargs): + # Pretend the destination path is on a different filesystem. + raise OSError() + +def mock_rename(func): + @functools.wraps(func) + def wrap(*args, **kwargs): + try: + builtin_rename = os.rename + os.rename = _fake_rename + return func(*args, **kwargs) + finally: + os.rename = builtin_rename + return wrap + class TestShutil(unittest.TestCase): def setUp(self): @@ -393,6 +409,41 @@ class TestShutil(unittest.TestCase): shutil.copytree(src_dir, dst_dir, symlinks=True) self.assertIn('test.txt', os.listdir(dst_dir)) + def _copy_file(self, method): + fname = 'test.txt' + tmpdir = self.mkdtemp() + self.write_file([tmpdir, fname]) + file1 = os.path.join(tmpdir, fname) + tmpdir2 = self.mkdtemp() + method(file1, tmpdir2) + file2 = os.path.join(tmpdir2, fname) + return (file1, file2) + + @unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.chmod') + def test_copy(self): + # Ensure that the copied file exists and has the same mode bits. + file1, file2 = self._copy_file(shutil.copy) + self.assertTrue(os.path.exists(file2)) + self.assertEqual(os.stat(file1).st_mode, os.stat(file2).st_mode) + + @unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.chmod') + @unittest.skipUnless(hasattr(os, 'chmod'), 'requires os.utime') + def test_copy2(self): + # Ensure that the copied file exists and has the same mode and + # modification time bits. + file1, file2 = self._copy_file(shutil.copy2) + self.assertTrue(os.path.exists(file2)) + file1_stat = os.stat(file1) + file2_stat = os.stat(file2) + self.assertEqual(file1_stat.st_mode, file2_stat.st_mode) + for attr in 'st_atime', 'st_mtime': + # The modification times may be truncated in the new file. + self.assertLessEqual(getattr(file1_stat, attr), + getattr(file2_stat, attr) + 1) + if hasattr(os, 'chflags') and hasattr(file1_stat, 'st_flags'): + self.assertEqual(getattr(file1_stat, 'st_flags'), + getattr(file2_stat, 'st_flags')) + @unittest.skipUnless(zlib, "requires zlib") def test_make_tarball(self): # creating something to tar @@ -403,6 +454,8 @@ class TestShutil(unittest.TestCase): self.write_file([tmpdir, 'sub', 'file3'], 'xxx') tmpdir2 = self.mkdtemp() + # force shutil to create the directory + os.rmdir(tmpdir2) unittest.skipUnless(splitdrive(tmpdir)[0] == splitdrive(tmpdir2)[0], "source and target should be on same drive") @@ -518,6 +571,8 @@ class TestShutil(unittest.TestCase): self.write_file([tmpdir, 'file2'], 'xxx') tmpdir2 = self.mkdtemp() + # force shutil to create the directory + os.rmdir(tmpdir2) base_name = os.path.join(tmpdir2, 'archive') _make_zipfile(base_name, tmpdir) @@ -688,20 +743,11 @@ class TestMove(unittest.TestCase): self.dst_dir = tempfile.mkdtemp() self.src_file = os.path.join(self.src_dir, filename) self.dst_file = os.path.join(self.dst_dir, filename) - # Try to create a dir in the current directory, hoping that it is - # not located on the same filesystem as the system tmp dir. - try: - self.dir_other_fs = tempfile.mkdtemp( - dir=os.path.dirname(__file__)) - self.file_other_fs = os.path.join(self.dir_other_fs, - filename) - except OSError: - self.dir_other_fs = None with open(self.src_file, "wb") as f: f.write(b"spam") def tearDown(self): - for d in (self.src_dir, self.dst_dir, self.dir_other_fs): + for d in (self.src_dir, self.dst_dir): try: if d: shutil.rmtree(d) @@ -730,21 +776,15 @@ class TestMove(unittest.TestCase): # Move a file inside an existing dir on the same filesystem. self._check_move_file(self.src_file, self.dst_dir, self.dst_file) + @mock_rename def test_move_file_other_fs(self): # Move a file to an existing dir on another filesystem. - if not self.dir_other_fs: - # skip - return - self._check_move_file(self.src_file, self.file_other_fs, - self.file_other_fs) + self.test_move_file() + @mock_rename def test_move_file_to_dir_other_fs(self): # Move a file to another location on another filesystem. - if not self.dir_other_fs: - # skip - return - self._check_move_file(self.src_file, self.dir_other_fs, - self.file_other_fs) + self.test_move_file_to_dir() def test_move_dir(self): # Move a dir to another location on the same filesystem. @@ -757,32 +797,20 @@ class TestMove(unittest.TestCase): except: pass + @mock_rename def test_move_dir_other_fs(self): # Move a dir to another location on another filesystem. - if not self.dir_other_fs: - # skip - return - dst_dir = tempfile.mktemp(dir=self.dir_other_fs) - try: - self._check_move_dir(self.src_dir, dst_dir, dst_dir) - finally: - try: - shutil.rmtree(dst_dir) - except: - pass + self.test_move_dir() def test_move_dir_to_dir(self): # Move a dir inside an existing dir on the same filesystem. self._check_move_dir(self.src_dir, self.dst_dir, os.path.join(self.dst_dir, os.path.basename(self.src_dir))) + @mock_rename def test_move_dir_to_dir_other_fs(self): # Move a dir inside an existing dir on another filesystem. - if not self.dir_other_fs: - # skip - return - self._check_move_dir(self.src_dir, self.dir_other_fs, - os.path.join(self.dir_other_fs, os.path.basename(self.src_dir))) + self.test_move_dir_to_dir() def test_existing_file_inside_dest_dir(self): # A file with the same name inside the destination dir already exists. From 296d9a6f85f4315ce492650dbca8de34c700c277 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 14:14:18 -0400 Subject: [PATCH 12/30] Add missing NEWS entries --- Misc/NEWS | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index ff5d7494fb8..738b9c14778 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #11548: shutil.unpack_archive now correctly handles the format + parameter. Patch by Evan Dandrea. + - Issue #11133: fix two cases where inspect.getattr_static can trigger code execution. Patch by Andreas Stührk. @@ -119,6 +122,9 @@ Tools/Demos Tests ----- +- Issue #11548: Improve test coverage of the shutil module. Patch by + Evan Dandrea. + - Issue #11554: Reactivated test_email_codecs. - Issue #11490: test_subprocess:test_leaking_fds_on_error no longer gives a From 454e11d874055f200bee84002447e50d5d467bf2 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 14:19:22 -0400 Subject: [PATCH 13/30] Fix typo in NEWS --- Misc/NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index 738b9c14778..b44650c44ca 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,7 +40,7 @@ Core and Builtins Library ------- -- Issue #11548: shutil.unpack_archive now correctly handles the format +- Issue #11560: shutil.unpack_archive now correctly handles the format parameter. Patch by Evan Dandrea. - Issue #11133: fix two cases where inspect.getattr_static can trigger code From 7462fa654ba50b3ab19f3bea37816b5894990618 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 14:30:45 -0400 Subject: [PATCH 14/30] Backport improved test coverage for string.py --- Lib/test/test_pep292.py | 13 +++++++++++++ Lib/test/test_string.py | 24 ++++++++++++++++++++++++ Misc/ACKS | 1 + Misc/NEWS | 3 +++ 4 files changed, 41 insertions(+) diff --git a/Lib/test/test_pep292.py b/Lib/test/test_pep292.py index a9676495e97..119c7ea8a1f 100644 --- a/Lib/test/test_pep292.py +++ b/Lib/test/test_pep292.py @@ -42,6 +42,19 @@ class TestTemplate(unittest.TestCase): s = Template('$who likes $$') eq(s.substitute(dict(who='tim', what='ham')), 'tim likes $') + def test_invalid(self): + class MyPattern(Template): + pattern = r""" + (?: + (?P) | + (?P%(delim)s) | + @(?P%(id)s) | + @{(?P%(id)s)} + ) + """ + s = MyPattern('$') + self.assertRaises(ValueError, s.substitute, dict()) + def test_percents(self): eq = self.assertEqual s = Template('%(foo)s $foo ${foo}') diff --git a/Lib/test/test_string.py b/Lib/test/test_string.py index f46be631ed8..a352ee35605 100644 --- a/Lib/test/test_string.py +++ b/Lib/test/test_string.py @@ -112,6 +112,30 @@ class ModuleTest(unittest.TestCase): self.assertRaises(ValueError, fmt.format, "{0}", 10, 20, i=100) self.assertRaises(ValueError, fmt.format, "{i}", 10, 20, i=100) + def test_vformat_assert(self): + cls = string.Formatter() + kwargs = { + "i": 100 + } + self.assertRaises(ValueError, cls._vformat, + cls.format, "{0}", kwargs, set(), -2) + + def test_convert_field(self): + cls = string.Formatter() + self.assertEqual(cls.format("{0!s}", 'foo'), 'foo') + self.assertRaises(ValueError, cls.format, "{0!h}", 'foo') + + def test_get_field(self): + cls = string.Formatter() + class MyClass: + name = 'lumberjack' + x = MyClass() + self.assertEqual(cls.format("{0.name}", x), 'lumberjack') + + lookup = ["eggs", "and", "spam"] + self.assertEqual(cls.format("{0[2]}", lookup), 'spam') + + def test_main(): support.run_unittest(ModuleTest) diff --git a/Misc/ACKS b/Misc/ACKS index 5c1bdc5904c..1e2b83d4ced 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -32,6 +32,7 @@ Oliver Andrich Ross Andrus Jon Anglin Éric Araujo +Alicia Arlen Jason Asbahr David Ascher Chris AtLee diff --git a/Misc/NEWS b/Misc/NEWS index b44650c44ca..419b0d5dcc0 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -122,6 +122,9 @@ Tools/Demos Tests ----- +- Issue #11505: improves test coverage of string.py. Patch by Alicia + Arlen. + - Issue #11548: Improve test coverage of the shutil module. Patch by Evan Dandrea. From d3b7a55f543bf1c3ea6bcf10dd03b0919822f993 Mon Sep 17 00:00:00 2001 From: Jesus Cea Date: Wed, 16 Mar 2011 20:37:54 +0100 Subject: [PATCH 15/30] Close Issue 11570: Lib/test/test_distutils.py tries to mix 32 and 64 bits object files, doesn't obey LDFLAGS --- configure | 7 ++++--- configure.in | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 1ef57d06bc7..90ad156601b 100755 --- a/configure +++ b/configure @@ -769,7 +769,8 @@ CFLAGS LDFLAGS LIBS CPPFLAGS -CPP' +CPP +CPPFLAGS' # Initialize some variables set by options. @@ -7551,8 +7552,8 @@ then IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; SunOS/5*) if test "$GCC" = "yes" - then LDSHARED='$(CC) -shared' - else LDSHARED='$(CC) -G'; + then LDSHARED='$(CC) -shared $(LDFLAGS)' + else LDSHARED='$(CC) -G $(LDFLAGS)'; fi ;; hp*|HP*) if test "$GCC" = "yes" diff --git a/configure.in b/configure.in index 3c6bd6f1a90..9b7a5a7f700 100644 --- a/configure.in +++ b/configure.in @@ -1758,8 +1758,8 @@ then IRIX*/6*) LDSHARED="ld ${SGI_ABI} -shared -all";; SunOS/5*) if test "$GCC" = "yes" - then LDSHARED='$(CC) -shared' - else LDSHARED='$(CC) -G'; + then LDSHARED='$(CC) -shared $(LDFLAGS)' + else LDSHARED='$(CC) -G $(LDFLAGS)'; fi ;; hp*|HP*) if test "$GCC" = "yes" From 6d94bd470e3f4aa1dc7295b034553509ace2c654 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 16 Mar 2011 15:52:22 -0400 Subject: [PATCH 16/30] #9298: restore proper folding of base64 encoded bodies. Patch by Yves Dorfsman. --- Lib/email/encoders.py | 2 +- Lib/email/test/test_email.py | 20 +++++++++++++++----- Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 4 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Lib/email/encoders.py b/Lib/email/encoders.py index 0ea441d9637..dfaac582046 100644 --- a/Lib/email/encoders.py +++ b/Lib/email/encoders.py @@ -12,7 +12,7 @@ __all__ = [ ] -from base64 import b64encode as _bencode +from base64 import encodebytes as _bencode from quopri import encodestring as _encodestring diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 0f28a9cdc95..6a88b1670fc 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -553,9 +553,18 @@ class TestMessageAPI(TestEmailBase): msg['Dummy'] = 'dummy\nX-Injected-Header: test' self.assertRaises(errors.HeaderParseError, msg.as_string) - # Test the email.encoders module class TestEncoders(unittest.TestCase): + + def test_EncodersEncode_base64(self): + with openfile('PyBanner048.gif', 'rb') as fp: + bindata = fp.read() + mimed = email.mime.image.MIMEImage(bindata) + base64ed = mimed.get_payload() + # the transfer-encoded body lines should all be <=76 characters + lines = base64ed.split('\n') + self.assertLessEqual(max([ len(x) for x in lines ]), 76) + def test_encode_empty_payload(self): eq = self.assertEqual msg = Message() @@ -1107,10 +1116,11 @@ class TestMIMEApplication(unittest.TestCase): def test_body(self): eq = self.assertEqual - bytes = b'\xfa\xfb\xfc\xfd\xfe\xff' - msg = MIMEApplication(bytes) - eq(msg.get_payload(), '+vv8/f7/') - eq(msg.get_payload(decode=True), bytes) + bytesdata = b'\xfa\xfb\xfc\xfd\xfe\xff' + msg = MIMEApplication(bytesdata) + # whitespace in the cte encoded block is RFC-irrelevant. + eq(msg.get_payload().strip(), '+vv8/f7/') + eq(msg.get_payload(decode=True), bytesdata) diff --git a/Misc/ACKS b/Misc/ACKS index e5ee8710b00..5d9b198301e 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -202,6 +202,7 @@ Daniel Dittmar Jaromir Dolecek Ismail Donmez Dima Dorfman +Yves Dorfsman Cesar Douady Dean Draayer Fred L. Drake, Jr. diff --git a/Misc/NEWS b/Misc/NEWS index d5c4699b68e..beb6ec1c121 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,10 @@ Core and Builtins Library ------- +- Issue #9298: base64 bodies weren't being folded to line lengths less than 78, + which was a regression relative to Python2. Unlike Python2, the last line + of the folded body now ends with a carriage return. + - Issue #11569: use absolute path to the sysctl command in multiprocessing to ensure that it will be found regardless of the shell PATH. This ensures that multiprocessing.cpu_count works on default installs of MacOSX. From 2b228f0d9b3bc5ed99162b052c5eae515f55f3b8 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 16 Mar 2011 16:57:54 -0400 Subject: [PATCH 17/30] Include the timeout value in TimeoutExpired. This was the original intention, but it wasn't threaded all the way through due to 'endtime'. Also added a trivial assertion to get coverage of __str__. --- Lib/subprocess.py | 54 ++++++++++++++++++++++--------------- Lib/test/test_subprocess.py | 4 ++- 2 files changed, 35 insertions(+), 23 deletions(-) diff --git a/Lib/subprocess.py b/Lib/subprocess.py index 0e15f10c662..4a8adcfa7d2 100644 --- a/Lib/subprocess.py +++ b/Lib/subprocess.py @@ -371,8 +371,9 @@ class TimeoutExpired(SubprocessError): """This exception is raised when the timeout expires while waiting for a child process. """ - def __init__(self, cmd, output=None): + def __init__(self, cmd, timeout, output=None): self.cmd = cmd + self.timeout = timeout self.output = output def __str__(self): @@ -533,7 +534,7 @@ def check_output(*popenargs, timeout=None, **kwargs): except TimeoutExpired: process.kill() output, unused_err = process.communicate() - raise TimeoutExpired(process.args, output=output) + raise TimeoutExpired(process.args, timeout, output=output) retcode = process.poll() if retcode: raise CalledProcessError(retcode, process.args, output=output) @@ -844,7 +845,7 @@ class Popen(object): return (stdout, stderr) try: - stdout, stderr = self._communicate(input, endtime) + stdout, stderr = self._communicate(input, endtime, timeout) finally: self._communication_started = True @@ -865,12 +866,12 @@ class Popen(object): return endtime - time.time() - def _check_timeout(self, endtime): + def _check_timeout(self, endtime, orig_timeout): """Convenience for checking if a timeout has expired.""" if endtime is None: return if time.time() > endtime: - raise TimeoutExpired(self.args) + raise TimeoutExpired(self.args, orig_timeout) if mswindows: @@ -1063,9 +1064,11 @@ class Popen(object): return self.returncode - def wait(self, timeout=None): + def wait(self, timeout=None, endtime=None): """Wait for child process to terminate. Returns returncode attribute.""" + if endtime is not None: + timeout = self._remaining_time(endtime) if timeout is None: timeout = _subprocess.INFINITE else: @@ -1073,7 +1076,7 @@ class Popen(object): if self.returncode is None: result = _subprocess.WaitForSingleObject(self._handle, timeout) if result == _subprocess.WAIT_TIMEOUT: - raise TimeoutExpired(self.args) + raise TimeoutExpired(self.args, timeout) self.returncode = _subprocess.GetExitCodeProcess(self._handle) return self.returncode @@ -1083,7 +1086,7 @@ class Popen(object): fh.close() - def _communicate(self, input, endtime): + def _communicate(self, input, endtime, orig_timeout): # Start reader threads feeding into a list hanging off of this # object, unless they've already been started. if self.stdout and not hasattr(self, "_stdout_buff"): @@ -1489,13 +1492,18 @@ class Popen(object): def wait(self, timeout=None, endtime=None): """Wait for child process to terminate. Returns returncode attribute.""" - # If timeout was passed but not endtime, compute endtime in terms of - # timeout. - if endtime is None and timeout is not None: - endtime = time.time() + timeout if self.returncode is not None: return self.returncode - elif endtime is not None: + + # endtime is preferred to timeout. timeout is only used for + # printing. + if endtime is not None or timeout is not None: + if endtime is None: + endtime = time.time() + timeout + elif timeout is None: + timeout = self._remaining_time(endtime) + + if endtime is not None: # Enter a busy loop if we have a timeout. This busy loop was # cribbed from Lib/threading.py in Thread.wait() at r71065. delay = 0.0005 # 500 us -> initial delay of 1 ms @@ -1507,7 +1515,7 @@ class Popen(object): break remaining = self._remaining_time(endtime) if remaining <= 0: - raise TimeoutExpired(self.args) + raise TimeoutExpired(self.args, timeout) delay = min(delay * 2, remaining, .05) time.sleep(delay) elif self.returncode is None: @@ -1516,7 +1524,7 @@ class Popen(object): return self.returncode - def _communicate(self, input, endtime): + def _communicate(self, input, endtime, orig_timeout): if self.stdin and not self._communication_started: # Flush stdio buffer. This might block, if the user has # been writing to .stdin in an uncontrolled fashion. @@ -1525,9 +1533,11 @@ class Popen(object): self.stdin.close() if _has_poll: - stdout, stderr = self._communicate_with_poll(input, endtime) + stdout, stderr = self._communicate_with_poll(input, endtime, + orig_timeout) else: - stdout, stderr = self._communicate_with_select(input, endtime) + stdout, stderr = self._communicate_with_select(input, endtime, + orig_timeout) self.wait(timeout=self._remaining_time(endtime)) @@ -1550,7 +1560,7 @@ class Popen(object): return (stdout, stderr) - def _communicate_with_poll(self, input, endtime): + def _communicate_with_poll(self, input, endtime, orig_timeout): stdout = None # Return stderr = None # Return @@ -1601,7 +1611,7 @@ class Popen(object): if e.args[0] == errno.EINTR: continue raise - self._check_timeout(endtime) + self._check_timeout(endtime, orig_timeout) # XXX Rewrite these to use non-blocking I/O on the # file objects; they are no longer using C stdio! @@ -1625,7 +1635,7 @@ class Popen(object): return (stdout, stderr) - def _communicate_with_select(self, input, endtime): + def _communicate_with_select(self, input, endtime, orig_timeout): if not self._communication_started: self._read_set = [] self._write_set = [] @@ -1667,9 +1677,9 @@ class Popen(object): # According to the docs, returning three empty lists indicates # that the timeout expired. if not (rlist or wlist or xlist): - raise TimeoutExpired(self.args) + raise TimeoutExpired(self.args, orig_timeout) # We also check what time it is ourselves for good measure. - self._check_timeout(endtime) + self._check_timeout(endtime, orig_timeout) # XXX Rewrite these to use non-blocking I/O on the # file objects; they are no longer using C stdio! diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 31565432b0c..00cf0d5b4a9 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -651,7 +651,9 @@ class ProcessTestCase(BaseTestCase): def test_wait_timeout(self): p = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(0.1)"]) - self.assertRaises(subprocess.TimeoutExpired, p.wait, timeout=0.01) + with self.assertRaises(subprocess.TimeoutExpired) as c: + p.wait(timeout=0.01) + self.assertIn("0.01", str(c.exception)) # For coverage of __str__. self.assertEqual(p.wait(timeout=2), 0) From da9ac728a84778317e1d529f88e47b6d34a5a6b6 Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Wed, 16 Mar 2011 17:08:21 -0400 Subject: [PATCH 18/30] Bump up the subprocess timeouts even more. :( --- Lib/test/test_subprocess.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Lib/test/test_subprocess.py b/Lib/test/test_subprocess.py index 00cf0d5b4a9..2dde2458176 100644 --- a/Lib/test/test_subprocess.py +++ b/Lib/test/test_subprocess.py @@ -130,7 +130,9 @@ class ProcessTestCase(BaseTestCase): "import sys; sys.stdout.write('BDFL')\n" "sys.stdout.flush()\n" "while True: pass"], - timeout=1.5) + # Some heavily loaded buildbots (sparc Debian 3.x) require + # this much time to start and print. + timeout=3) self.fail("Expected TimeoutExpired.") self.assertEqual(c.exception.output, b'BDFL') @@ -647,15 +649,15 @@ class ProcessTestCase(BaseTestCase): # Subsequent invocations should just return the returncode self.assertEqual(p.wait(), 0) - def test_wait_timeout(self): p = subprocess.Popen([sys.executable, "-c", "import time; time.sleep(0.1)"]) with self.assertRaises(subprocess.TimeoutExpired) as c: p.wait(timeout=0.01) self.assertIn("0.01", str(c.exception)) # For coverage of __str__. - self.assertEqual(p.wait(timeout=2), 0) - + # Some heavily loaded buildbots (sparc Debian 3.x) require this much + # time to start. + self.assertEqual(p.wait(timeout=3), 0) def test_invalid_bufsize(self): # an invalid type of the bufsize argument should raise From 07926f024a9dd0fab190273ed84f5f1a8667308f Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Wed, 16 Mar 2011 17:19:16 -0400 Subject: [PATCH 19/30] Closes issue 11503. Improves test coverage of posixpath. --- Lib/test/test_posixpath.py | 63 ++++++++++++++++++++++++++++++++++++++ Misc/NEWS | 2 ++ 2 files changed, 65 insertions(+) diff --git a/Lib/test/test_posixpath.py b/Lib/test/test_posixpath.py index f045b0bf4a9..bb4559c4abd 100644 --- a/Lib/test/test_posixpath.py +++ b/Lib/test/test_posixpath.py @@ -6,6 +6,11 @@ import os import sys from posixpath import realpath, abspath, dirname, basename +try: + import posix +except ImportError: + posix = None + # An absolute path to a temporary filename for testing. We can't rely on TESTFN # being an absolute path, so we need this. @@ -150,6 +155,7 @@ class PosixPathTest(unittest.TestCase): def test_islink(self): self.assertIs(posixpath.islink(support.TESTFN + "1"), False) + self.assertIs(posixpath.lexists(support.TESTFN + "2"), False) f = open(support.TESTFN + "1", "wb") try: f.write(b"foo") @@ -225,6 +231,44 @@ class PosixPathTest(unittest.TestCase): def test_ismount(self): self.assertIs(posixpath.ismount("/"), True) + self.assertIs(posixpath.ismount(b"/"), True) + + def test_ismount_non_existent(self): + # Non-existent mountpoint. + self.assertIs(posixpath.ismount(ABSTFN), False) + try: + os.mkdir(ABSTFN) + self.assertIs(posixpath.ismount(ABSTFN), False) + finally: + safe_rmdir(ABSTFN) + + @unittest.skipUnless(support.can_symlink(), + "Test requires symlink support") + def test_ismount_symlinks(self): + # Symlinks are never mountpoints. + try: + os.symlink("/", ABSTFN) + self.assertIs(posixpath.ismount(ABSTFN), False) + finally: + os.unlink(ABSTFN) + + @unittest.skipIf(posix is None, "Test requires posix module") + def test_ismount_different_device(self): + # Simulate the path being on a different device from its parent by + # mocking out st_dev. + save_lstat = os.lstat + def fake_lstat(path): + st_ino = 0 + st_dev = 0 + if path == ABSTFN: + st_dev = 1 + st_ino = 1 + return posix.stat_result((0, st_ino, st_dev, 0, 0, 0, 0, 0, 0, 0)) + try: + os.lstat = fake_lstat + self.assertIs(posixpath.ismount(ABSTFN), True) + finally: + os.lstat = save_lstat def test_expanduser(self): self.assertEqual(posixpath.expanduser("foo"), "foo") @@ -254,6 +298,10 @@ class PosixPathTest(unittest.TestCase): with support.EnvironmentVarGuard() as env: env['HOME'] = '/' self.assertEqual(posixpath.expanduser("~"), "/") + # expanduser should fall back to using the password database + del env['HOME'] + home = pwd.getpwuid(os.getuid()).pw_dir + self.assertEqual(posixpath.expanduser("~"), home) def test_normpath(self): self.assertEqual(posixpath.normpath(""), ".") @@ -286,6 +334,16 @@ class PosixPathTest(unittest.TestCase): finally: support.unlink(ABSTFN) + @unittest.skipUnless(hasattr(os, "symlink"), + "Missing symlink implementation") + @skip_if_ABSTFN_contains_backslash + def test_realpath_relative(self): + try: + os.symlink(posixpath.relpath(ABSTFN+"1"), ABSTFN) + self.assertEqual(realpath(ABSTFN), ABSTFN+"1") + finally: + support.unlink(ABSTFN) + @unittest.skipUnless(hasattr(os, "symlink"), "Missing symlink implementation") @skip_if_ABSTFN_contains_backslash @@ -443,6 +501,11 @@ class PosixPathTest(unittest.TestCase): finally: os.getcwdb = real_getcwdb + def test_sameopenfile(self): + fname = support.TESTFN + "1" + with open(fname, "wb") as a, open(fname, "wb") as b: + self.assertTrue(posixpath.sameopenfile(a.fileno(), b.fileno())) + class PosixCommonTest(test_genericpath.CommonTest): pathmodule = posixpath diff --git a/Misc/NEWS b/Misc/NEWS index 9af14424680..eeea4ba097c 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -126,6 +126,8 @@ Tools/Demos Tests ----- +- Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. + - Issue #11505: improves test coverage of string.py. Patch by Alicia Arlen. From a88da67bcbf8b87af613751796998538afb26be0 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 16 Mar 2011 17:32:27 -0400 Subject: [PATCH 20/30] #11578: add unit tests for timeit module. Patch by Michael Henry. --- Lib/test/test_sundry.py | 1 - Lib/test/test_timeit.py | 305 ++++++++++++++++++++++++++++++++++++++++ Lib/timeit.py | 10 +- Misc/NEWS | 2 + 4 files changed, 315 insertions(+), 3 deletions(-) create mode 100644 Lib/test/test_timeit.py diff --git a/Lib/test/test_sundry.py b/Lib/test/test_sundry.py index 4dacb9d1c65..07802d6263f 100644 --- a/Lib/test/test_sundry.py +++ b/Lib/test/test_sundry.py @@ -54,7 +54,6 @@ class TestUntestedModules(unittest.TestCase): import py_compile import sndhdr import tabnanny - import timeit try: import tty # not available on Windows except ImportError: diff --git a/Lib/test/test_timeit.py b/Lib/test/test_timeit.py new file mode 100644 index 00000000000..eb3b1a156b2 --- /dev/null +++ b/Lib/test/test_timeit.py @@ -0,0 +1,305 @@ +import timeit +import unittest +import sys +import io +import time +from textwrap import dedent + +from test.support import run_unittest +from test.support import captured_stdout +from test.support import captured_stderr + +# timeit's default number of iterations. +DEFAULT_NUMBER = 1000000 + +# timeit's default number of repetitions. +DEFAULT_REPEAT = 3 + +# XXX: some tests are commented out that would improve the coverage but take a +# long time to run because they test the default number of loops, which is +# large. The tests could be enabled if there was a way to override the default +# number of loops during testing, but this would require changing the signature +# of some functions that use the default as a default argument. + +class FakeTimer: + BASE_TIME = 42.0 + def __init__(self, seconds_per_increment=1.0): + self.count = 0 + self.setup_calls = 0 + self.seconds_per_increment=seconds_per_increment + timeit._fake_timer = self + + def __call__(self): + return self.BASE_TIME + self.count * self.seconds_per_increment + + def inc(self): + self.count += 1 + + def setup(self): + self.setup_calls += 1 + + def wrap_timer(self, timer): + """Records 'timer' and returns self as callable timer.""" + self.saved_timer = timer + return self + +class TestTimeit(unittest.TestCase): + + def tearDown(self): + try: + del timeit._fake_timer + except AttributeError: + pass + + def test_reindent_empty(self): + self.assertEqual(timeit.reindent("", 0), "") + self.assertEqual(timeit.reindent("", 4), "") + + def test_reindent_single(self): + self.assertEqual(timeit.reindent("pass", 0), "pass") + self.assertEqual(timeit.reindent("pass", 4), "pass") + + def test_reindent_multi_empty(self): + self.assertEqual(timeit.reindent("\n\n", 0), "\n\n") + self.assertEqual(timeit.reindent("\n\n", 4), "\n \n ") + + def test_reindent_multi(self): + self.assertEqual(timeit.reindent( + "print()\npass\nbreak", 0), + "print()\npass\nbreak") + self.assertEqual(timeit.reindent( + "print()\npass\nbreak", 4), + "print()\n pass\n break") + + def test_timer_invalid_stmt(self): + self.assertRaises(ValueError, timeit.Timer, stmt=None) + + def test_timer_invalid_setup(self): + self.assertRaises(ValueError, timeit.Timer, setup=None) + + fake_setup = "import timeit; timeit._fake_timer.setup()" + fake_stmt = "import timeit; timeit._fake_timer.inc()" + + def fake_callable_setup(self): + self.fake_timer.setup() + + def fake_callable_stmt(self): + self.fake_timer.inc() + + def timeit(self, stmt, setup, number=None): + self.fake_timer = FakeTimer() + t = timeit.Timer(stmt=stmt, setup=setup, timer=self.fake_timer) + kwargs = {} + if number is None: + number = DEFAULT_NUMBER + else: + kwargs['number'] = number + delta_time = t.timeit(**kwargs) + self.assertEqual(self.fake_timer.setup_calls, 1) + self.assertEqual(self.fake_timer.count, number) + self.assertEqual(delta_time, number) + + # Takes too long to run in debug build. + #def test_timeit_default_iters(self): + # self.timeit(self.fake_stmt, self.fake_setup) + + def test_timeit_zero_iters(self): + self.timeit(self.fake_stmt, self.fake_setup, number=0) + + def test_timeit_few_iters(self): + self.timeit(self.fake_stmt, self.fake_setup, number=3) + + def test_timeit_callable_stmt(self): + self.timeit(self.fake_callable_stmt, self.fake_setup, number=3) + + def test_timeit_callable_stmt_and_setup(self): + self.timeit(self.fake_callable_stmt, + self.fake_callable_setup, number=3) + + # Takes too long to run in debug build. + #def test_timeit_function(self): + # delta_time = timeit.timeit(self.fake_stmt, self.fake_setup, + # timer=FakeTimer()) + # self.assertEqual(delta_time, DEFAULT_NUMBER) + + def test_timeit_function_zero_iters(self): + delta_time = timeit.timeit(self.fake_stmt, self.fake_setup, number=0, + timer=FakeTimer()) + self.assertEqual(delta_time, 0) + + def repeat(self, stmt, setup, repeat=None, number=None): + self.fake_timer = FakeTimer() + t = timeit.Timer(stmt=stmt, setup=setup, timer=self.fake_timer) + kwargs = {} + if repeat is None: + repeat = DEFAULT_REPEAT + else: + kwargs['repeat'] = repeat + if number is None: + number = DEFAULT_NUMBER + else: + kwargs['number'] = number + delta_times = t.repeat(**kwargs) + self.assertEqual(self.fake_timer.setup_calls, repeat) + self.assertEqual(self.fake_timer.count, repeat * number) + self.assertEqual(delta_times, repeat * [float(number)]) + + # Takes too long to run in debug build. + #def test_repeat_default(self): + # self.repeat(self.fake_stmt, self.fake_setup) + + def test_repeat_zero_reps(self): + self.repeat(self.fake_stmt, self.fake_setup, repeat=0) + + def test_repeat_zero_iters(self): + self.repeat(self.fake_stmt, self.fake_setup, number=0) + + def test_repeat_few_reps_and_iters(self): + self.repeat(self.fake_stmt, self.fake_setup, repeat=3, number=5) + + def test_repeat_callable_stmt(self): + self.repeat(self.fake_callable_stmt, self.fake_setup, + repeat=3, number=5) + + def test_repeat_callable_stmt_and_setup(self): + self.repeat(self.fake_callable_stmt, self.fake_callable_setup, + repeat=3, number=5) + + # Takes too long to run in debug build. + #def test_repeat_function(self): + # delta_times = timeit.repeat(self.fake_stmt, self.fake_setup, + # timer=FakeTimer()) + # self.assertEqual(delta_times, DEFAULT_REPEAT * [float(DEFAULT_NUMBER)]) + + def test_repeat_function_zero_reps(self): + delta_times = timeit.repeat(self.fake_stmt, self.fake_setup, repeat=0, + timer=FakeTimer()) + self.assertEqual(delta_times, []) + + def test_repeat_function_zero_iters(self): + delta_times = timeit.repeat(self.fake_stmt, self.fake_setup, number=0, + timer=FakeTimer()) + self.assertEqual(delta_times, DEFAULT_REPEAT * [0.0]) + + def assert_exc_string(self, exc_string, expected_exc_name): + exc_lines = exc_string.splitlines() + self.assertGreater(len(exc_lines), 2) + self.assertTrue(exc_lines[0].startswith('Traceback')) + self.assertTrue(exc_lines[-1].startswith(expected_exc_name)) + + def test_print_exc(self): + s = io.StringIO() + t = timeit.Timer("1/0") + try: + t.timeit() + except: + t.print_exc(s) + self.assert_exc_string(s.getvalue(), 'ZeroDivisionError') + + MAIN_DEFAULT_OUTPUT = "10 loops, best of 3: 1 sec per loop\n" + + def run_main(self, seconds_per_increment=1.0, switches=None, timer=None): + if timer is None: + timer = FakeTimer(seconds_per_increment=seconds_per_increment) + if switches is None: + args = [] + else: + args = switches[:] + args.append(self.fake_stmt) + # timeit.main() modifies sys.path, so save and restore it. + orig_sys_path = sys.path[:] + with captured_stdout() as s: + timeit.main(args=args, _wrap_timer=timer.wrap_timer) + sys.path[:] = orig_sys_path[:] + return s.getvalue() + + def test_main_bad_switch(self): + s = self.run_main(switches=['--bad-switch']) + self.assertEqual(s, dedent("""\ + option --bad-switch not recognized + use -h/--help for command line help + """)) + + def test_main_seconds(self): + s = self.run_main(seconds_per_increment=5.5) + self.assertEqual(s, "10 loops, best of 3: 5.5 sec per loop\n") + + def test_main_milliseconds(self): + s = self.run_main(seconds_per_increment=0.0055) + self.assertEqual(s, "100 loops, best of 3: 5.5 msec per loop\n") + + def test_main_microseconds(self): + s = self.run_main(seconds_per_increment=0.0000025, switches=['-n100']) + self.assertEqual(s, "100 loops, best of 3: 2.5 usec per loop\n") + + def test_main_fixed_iters(self): + s = self.run_main(seconds_per_increment=2.0, switches=['-n35']) + self.assertEqual(s, "35 loops, best of 3: 2 sec per loop\n") + + def test_main_setup(self): + s = self.run_main(seconds_per_increment=2.0, + switches=['-n35', '-s', 'print("CustomSetup")']) + self.assertEqual(s, "CustomSetup\n" * 3 + + "35 loops, best of 3: 2 sec per loop\n") + + def test_main_fixed_reps(self): + s = self.run_main(seconds_per_increment=60.0, switches=['-r9']) + self.assertEqual(s, "10 loops, best of 9: 60 sec per loop\n") + + def test_main_negative_reps(self): + s = self.run_main(seconds_per_increment=60.0, switches=['-r-5']) + self.assertEqual(s, "10 loops, best of 1: 60 sec per loop\n") + + def test_main_help(self): + s = self.run_main(switches=['-h']) + # Note: It's not clear that the trailing space was intended as part of + # the help text, but since it's there, check for it. + self.assertEqual(s, timeit.__doc__ + ' ') + + def test_main_using_time(self): + fake_timer = FakeTimer() + s = self.run_main(switches=['-t'], timer=fake_timer) + self.assertEqual(s, self.MAIN_DEFAULT_OUTPUT) + self.assertIs(fake_timer.saved_timer, time.time) + + def test_main_using_clock(self): + fake_timer = FakeTimer() + s = self.run_main(switches=['-c'], timer=fake_timer) + self.assertEqual(s, self.MAIN_DEFAULT_OUTPUT) + self.assertIs(fake_timer.saved_timer, time.clock) + + def test_main_verbose(self): + s = self.run_main(switches=['-v']) + self.assertEqual(s, dedent("""\ + 10 loops -> 10 secs + raw times: 10 10 10 + 10 loops, best of 3: 1 sec per loop + """)) + + def test_main_very_verbose(self): + s = self.run_main(seconds_per_increment=0.000050, switches=['-vv']) + self.assertEqual(s, dedent("""\ + 10 loops -> 0.0005 secs + 100 loops -> 0.005 secs + 1000 loops -> 0.05 secs + 10000 loops -> 0.5 secs + raw times: 0.5 0.5 0.5 + 10000 loops, best of 3: 50 usec per loop + """)) + + def test_main_exception(self): + with captured_stderr() as error_stringio: + s = self.run_main(switches=['1/0']) + self.assert_exc_string(error_stringio.getvalue(), 'ZeroDivisionError') + + def test_main_exception_fixed_reps(self): + with captured_stderr() as error_stringio: + s = self.run_main(switches=['-n1', '1/0']) + self.assert_exc_string(error_stringio.getvalue(), 'ZeroDivisionError') + + +def test_main(): + run_unittest(TestTimeit) + +if __name__ == '__main__': + test_main() diff --git a/Lib/timeit.py b/Lib/timeit.py index 5c613fce032..8e046452625 100644 --- a/Lib/timeit.py +++ b/Lib/timeit.py @@ -232,10 +232,10 @@ def repeat(stmt="pass", setup="pass", timer=default_timer, """Convenience function to create Timer object and call repeat method.""" return Timer(stmt, setup, timer).repeat(repeat, number) -def main(args=None): +def main(args=None, *, _wrap_timer=None): """Main program, used when run as a script. - The optional argument specifies the command line to be parsed, + The optional 'args' argument specifies the command line to be parsed, defaulting to sys.argv[1:]. The return value is an exit code to be passed to sys.exit(); it @@ -244,6 +244,10 @@ def main(args=None): When an exception happens during timing, a traceback is printed to stderr and the return value is 1. Exceptions at other times (including the template compilation) are not caught. + + '_wrap_timer' is an internal interface used for unit testing. If it + is not None, it must be a callable that accepts a timer function + and returns another timer function (used for unit testing). """ if args is None: args = sys.argv[1:] @@ -289,6 +293,8 @@ def main(args=None): # directory) import os sys.path.insert(0, os.curdir) + if _wrap_timer is not None: + timer = _wrap_timer(timer) t = Timer(stmt, setup, timer) if number == 0: # determine number so that 0.2 <= total time < 2.0 diff --git a/Misc/NEWS b/Misc/NEWS index eeea4ba097c..781f94327c6 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -126,6 +126,8 @@ Tools/Demos Tests ----- +- Issue #11578: added test for the timeit module. Patch Michael Henry. + - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. - Issue #11505: improves test coverage of string.py. Patch by Alicia From de91276a5c90b9d3e42866054e48d255a37981b3 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 16 Mar 2011 18:26:23 -0400 Subject: [PATCH 21/30] #11401: handle headers with no value. --- Lib/email/header.py | 2 +- Lib/email/test/test_email.py | 7 +++++++ Misc/NEWS | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Lib/email/header.py b/Lib/email/header.py index 43220df7620..da739d58925 100644 --- a/Lib/email/header.py +++ b/Lib/email/header.py @@ -304,7 +304,7 @@ class Header: self._continuation_ws, splitchars) for string, charset in self._chunks: lines = string.splitlines() - formatter.feed(lines[0], charset) + formatter.feed(lines[0] if lines else '', charset) for line in lines[1:]: formatter.newline() if charset.header_encoding is not None: diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index 6a88b1670fc..4268a25996f 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -3296,6 +3296,13 @@ A very long line that must get split to something other than at the h = Header('文', charset='shift_jis') self.assertEqual(h.encode(), '=?iso-2022-jp?b?GyRCSjgbKEI=?=') + def test_flatten_header_with_no_value(self): + # Issue 11401 (regression from email 4.x) Note that the space after + # the header doesn't reflect the input, but this is also the way + # email 4.x behaved. At some point it would be nice to fix that. + msg = email.message_from_string("EmptyHeader:") + self.assertEqual(str(msg), "EmptyHeader: \n\n") + # Test RFC 2231 header parameters (en/de)coding diff --git a/Misc/NEWS b/Misc/NEWS index beb6ec1c121..58eea2d3a1d 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #11401: fix handling of headers with no value; this fixes a regression + relative to Python2 and the result is now the same as it was in Python2. + - Issue #9298: base64 bodies weren't being folded to line lengths less than 78, which was a regression relative to Python2. Unlike Python2, the last line of the folded body now ends with a carriage return. From c95ec3d560dd21e678958016aa46313f619b83e7 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 19:52:14 -0400 Subject: [PATCH 22/30] Exercise crashers to ensure they are still covering known error cases --- Lib/test/crashers/README | 4 ++++ Lib/test/test_crashers.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 Lib/test/test_crashers.py diff --git a/Lib/test/crashers/README b/Lib/test/crashers/README index 2a73e1bbd93..0259a0688cb 100644 --- a/Lib/test/crashers/README +++ b/Lib/test/crashers/README @@ -14,3 +14,7 @@ note if the cause is system or environment dependent and what the variables are. Once the crash is fixed, the test case should be moved into an appropriate test (even if it was originally from the test suite). This ensures the regression doesn't happen again. And if it does, it should be easier to track down. + +Also see Lib/test_crashers.py which exercises the crashers in this directory. +In particular, make sure to add any new infinite loop crashers to the black +list so it doesn't try to run them. diff --git a/Lib/test/test_crashers.py b/Lib/test/test_crashers.py new file mode 100644 index 00000000000..ee612c2bc90 --- /dev/null +++ b/Lib/test/test_crashers.py @@ -0,0 +1,35 @@ +# Tests that the crashers in the Lib/test/crashers directory actually +# do crash the interpreter as expected +# +# If a crasher is fixed, it should be moved elsewhere in the test suite to +# ensure it continues to work correctly. + +import unittest +import glob +import os.path +import test.support +from test.script_helper import assert_python_failure + +CRASHER_DIR = os.path.join(os.path.dirname(__file__), "crashers") +CRASHER_FILES = os.path.join(CRASHER_DIR, "*.py") + +infinite_loops = ["infinite_loop_re.py", "nasty_eq_vs_dict.py"] + +class CrasherTest(unittest.TestCase): + + @test.support.cpython_only + def test_crashers_crash(self): + for fname in glob.glob(CRASHER_FILES): + if os.path.basename(fname) in infinite_loops: + continue + # Some "crashers" only trigger an exception rather than a + # segfault. Consider that an acceptable outcome. + assert_python_failure(fname) + + +def test_main(): + test.support.run_unittest(CrasherTest) + test.support.reap_children() + +if __name__ == "__main__": + test_main() From 49cb9593a0ae4da35c44fa46636e4a11acd2581a Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 20:23:58 -0400 Subject: [PATCH 23/30] Add missing NEWS item for previous commit --- Misc/NEWS | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Misc/NEWS b/Misc/NEWS index 4b2aa5923f5..e158d560d49 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -239,6 +239,9 @@ Tools/Demos Tests ----- +- New test_crashers added to exercise the scripts in the Lib/test/crashers + directory and confirm they fail as expected + - Issue #11578: added test for the timeit module. Patch Michael Henry. - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. From a215023b784eb1e23b2e91a007bc9a19750ed3c0 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Wed, 16 Mar 2011 21:11:23 -0400 Subject: [PATCH 24/30] #11243: tests and fixes for handling of 'dirty data' in additional methods --- Lib/email/message.py | 13 +++++---- Lib/email/test/test_email.py | 52 ++++++++++++++++++++++++++++++++++++ Misc/NEWS | 3 +++ 3 files changed, 63 insertions(+), 5 deletions(-) diff --git a/Lib/email/message.py b/Lib/email/message.py index 2713bc5d355..922617adbbb 100644 --- a/Lib/email/message.py +++ b/Lib/email/message.py @@ -48,9 +48,9 @@ def _sanitize_header(name, value): def _splitparam(param): # Split header parameters. BAW: this may be too simple. It isn't # strictly RFC 2045 (section 5.1) compliant, but it catches most headers - # found in the wild. We may eventually need a full fledged parser - # eventually. - a, sep, b = param.partition(';') + # found in the wild. We may eventually need a full fledged parser. + # RDM: we might have a Header here; for now just stringify it. + a, sep, b = str(param).partition(';') if not sep: return a.strip(), None return a.strip(), b.strip() @@ -90,6 +90,8 @@ def _formatparam(param, value=None, quote=True): return param def _parseparam(s): + # RDM This might be a Header, so for now stringify it. + s = ';' + str(s) plist = [] while s[:1] == ';': s = s[1:] @@ -240,7 +242,8 @@ class Message: if i is not None and not isinstance(self._payload, list): raise TypeError('Expected list, got %s' % type(self._payload)) payload = self._payload - cte = self.get('content-transfer-encoding', '').lower() + # cte might be a Header, so for now stringify it. + cte = str(self.get('content-transfer-encoding', '')).lower() # payload may be bytes here. if isinstance(payload, str): if _has_surrogates(payload): @@ -561,7 +564,7 @@ class Message: if value is missing: return failobj params = [] - for p in _parseparam(';' + value): + for p in _parseparam(value): try: name, val = p.split('=', 1) name = name.strip() diff --git a/Lib/email/test/test_email.py b/Lib/email/test/test_email.py index dcb2e95493d..9f64e091a20 100644 --- a/Lib/email/test/test_email.py +++ b/Lib/email/test/test_email.py @@ -2995,6 +2995,58 @@ class Test8BitBytesHandling(unittest.TestCase): ['foo@bar.com', 'g\uFFFD\uFFFDst']) + def test_get_content_type_with_8bit(self): + msg = email.message_from_bytes(textwrap.dedent("""\ + Content-Type: text/pl\xA7in; charset=utf-8 + """).encode('latin-1')) + self.assertEqual(msg.get_content_type(), "text/pl\uFFFDin") + self.assertEqual(msg.get_content_maintype(), "text") + self.assertEqual(msg.get_content_subtype(), "pl\uFFFDin") + + def test_get_params_with_8bit(self): + msg = email.message_from_bytes( + 'X-Header: foo=\xa7ne; b\xa7r=two; baz=three\n'.encode('latin-1')) + self.assertEqual(msg.get_params(header='x-header'), + [('foo', '\uFFFDne'), ('b\uFFFDr', 'two'), ('baz', 'three')]) + self.assertEqual(msg.get_param('Foo', header='x-header'), '\uFFFdne') + # XXX: someday you might be able to get 'b\xa7r', for now you can't. + self.assertEqual(msg.get_param('b\xa7r', header='x-header'), None) + + def test_get_rfc2231_params_with_8bit(self): + msg = email.message_from_bytes(textwrap.dedent("""\ + Content-Type: text/plain; charset=us-ascii; + title*=us-ascii'en'This%20is%20not%20f\xa7n""" + ).encode('latin-1')) + self.assertEqual(msg.get_param('title'), + ('us-ascii', 'en', 'This is not f\uFFFDn')) + + def test_set_rfc2231_params_with_8bit(self): + msg = email.message_from_bytes(textwrap.dedent("""\ + Content-Type: text/plain; charset=us-ascii; + title*=us-ascii'en'This%20is%20not%20f\xa7n""" + ).encode('latin-1')) + msg.set_param('title', 'test') + self.assertEqual(msg.get_param('title'), 'test') + + def test_del_rfc2231_params_with_8bit(self): + msg = email.message_from_bytes(textwrap.dedent("""\ + Content-Type: text/plain; charset=us-ascii; + title*=us-ascii'en'This%20is%20not%20f\xa7n""" + ).encode('latin-1')) + msg.del_param('title') + self.assertEqual(msg.get_param('title'), None) + self.assertEqual(msg.get_content_maintype(), 'text') + + def test_get_payload_with_8bit_cte_header(self): + msg = email.message_from_bytes(textwrap.dedent("""\ + Content-Transfer-Encoding: b\xa7se64 + Content-Type: text/plain; charset=latin-1 + + payload + """).encode('latin-1')) + self.assertEqual(msg.get_payload(), 'payload\n') + self.assertEqual(msg.get_payload(decode=True), b'payload\n') + non_latin_bin_msg = textwrap.dedent("""\ From: foo@bar.com To: báz diff --git a/Misc/NEWS b/Misc/NEWS index c787ece2a8f..c787fedbaba 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,9 @@ Core and Builtins Library ------- +- Issue #11243: fix the parameter querying methods of Message to work if + the headers contain un-encoded non-ASCII data. + - Issue #11401: fix handling of headers with no value; this fixes a regression relative to Python2 and the result is now the same as it was in Python2. From b3c728fd8924f271c708ea8ae6692ae5cb484a34 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Wed, 16 Mar 2011 21:26:40 -0400 Subject: [PATCH 25/30] Close #11577: Improve binhex test coverage and fix ResourceWarning --- Lib/binhex.py | 42 +++++++++++++++++++++++------------------ Lib/test/test_binhex.py | 11 +++++++++++ Misc/ACKS | 1 + Misc/NEWS | 4 ++++ 4 files changed, 40 insertions(+), 18 deletions(-) diff --git a/Lib/binhex.py b/Lib/binhex.py index 4b7997a7102..999a6755133 100644 --- a/Lib/binhex.py +++ b/Lib/binhex.py @@ -52,14 +52,13 @@ class FInfo: def getfileinfo(name): finfo = FInfo() - fp = io.open(name, 'rb') - # Quick check for textfile - data = fp.read(512) - if 0 not in data: - finfo.Type = 'TEXT' - fp.seek(0, 2) - dsize = fp.tell() - fp.close() + with io.open(name, 'rb') as fp: + # Quick check for textfile + data = fp.read(512) + if 0 not in data: + finfo.Type = 'TEXT' + fp.seek(0, 2) + dsize = fp.tell() dir, file = os.path.split(name) file = file.replace(':', '-', 1) return file, finfo, dsize, 0 @@ -140,19 +139,26 @@ class _Rlecoderengine: class BinHex: def __init__(self, name_finfo_dlen_rlen, ofp): name, finfo, dlen, rlen = name_finfo_dlen_rlen + close_on_error = False if isinstance(ofp, str): ofname = ofp ofp = io.open(ofname, 'wb') - ofp.write(b'(This file must be converted with BinHex 4.0)\r\r:') - hqxer = _Hqxcoderengine(ofp) - self.ofp = _Rlecoderengine(hqxer) - self.crc = 0 - if finfo is None: - finfo = FInfo() - self.dlen = dlen - self.rlen = rlen - self._writeinfo(name, finfo) - self.state = _DID_HEADER + close_on_error = True + try: + ofp.write(b'(This file must be converted with BinHex 4.0)\r\r:') + hqxer = _Hqxcoderengine(ofp) + self.ofp = _Rlecoderengine(hqxer) + self.crc = 0 + if finfo is None: + finfo = FInfo() + self.dlen = dlen + self.rlen = rlen + self._writeinfo(name, finfo) + self.state = _DID_HEADER + except: + if close_on_error: + ofp.close() + raise def _writeinfo(self, name, finfo): nl = len(name) diff --git a/Lib/test/test_binhex.py b/Lib/test/test_binhex.py index d6ef84a5e0e..a807bca6393 100755 --- a/Lib/test/test_binhex.py +++ b/Lib/test/test_binhex.py @@ -15,10 +15,12 @@ class BinHexTestCase(unittest.TestCase): def setUp(self): self.fname1 = support.TESTFN + "1" self.fname2 = support.TESTFN + "2" + self.fname3 = support.TESTFN + "very_long_filename__very_long_filename__very_long_filename__very_long_filename__" def tearDown(self): support.unlink(self.fname1) support.unlink(self.fname2) + support.unlink(self.fname3) DATA = b'Jack is my hero' @@ -37,6 +39,15 @@ class BinHexTestCase(unittest.TestCase): self.assertEqual(self.DATA, finish) + def test_binhex_error_on_long_filename(self): + """ + The testcase fails if no exception is raised when a filename parameter provided to binhex.binhex() + is too long, or if the exception raised in binhex.binhex() is not an instance of binhex.Error. + """ + f3 = open(self.fname3, 'wb') + f3.close() + + self.assertRaises(binhex.Error, binhex.binhex, self.fname3, self.fname2) def test_main(): support.run_unittest(BinHexTestCase) diff --git a/Misc/ACKS b/Misc/ACKS index 0cbc6703d27..f2bf3cdc479 100644 --- a/Misc/ACKS +++ b/Misc/ACKS @@ -447,6 +447,7 @@ Tamito Kajiyama Peter van Kampen Rafe Kaplan Jacob Kaplan-Moss +Arkady Koplyarov Lou Kates Hiroaki Kawai Sebastien Keim diff --git a/Misc/NEWS b/Misc/NEWS index c787ece2a8f..f2d0d765891 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -40,6 +40,8 @@ Core and Builtins Library ------- +- Issue #11577: fix ResourceWarning triggered by improved binhex test coverage + - Issue #11401: fix handling of headers with no value; this fixes a regression relative to Python2 and the result is now the same as it was in Python2. @@ -129,6 +131,8 @@ Tools/Demos Tests ----- +- Issue #11577: improve test coverage of binhex.py. Patch by Arkady Koplyarov. + - Issue #11578: added test for the timeit module. Patch Michael Henry. - Issue #11503: improve test coverage of posixpath.py. Patch by Evan Dandrea. From b253c9f66de1226ad6b72d79af70563671fe4320 Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Thu, 17 Mar 2011 16:43:22 +0800 Subject: [PATCH 26/30] Fix issue11567: http.server DEFAULT_ERROR_MESSAGE format. Patch by Gennadiy Zlobin. --- Lib/http/server.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Lib/http/server.py b/Lib/http/server.py index 543abe0c9f9..c0245ecc06d 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -103,15 +103,20 @@ import copy # Default error message template DEFAULT_ERROR_MESSAGE = """\ - -Error response - - -

Error response

-

Error code %(code)d. -

Message: %(message)s. -

Error code explanation: %(code)s = %(explain)s. - + + + + + Error response + + +

Error response

+

Error code: %(code)d

+

Message: %(message)s.

+

Error code explanation: %(code)s - %(explain)s.

+ + """ DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8" From 9f9193ec375ed0f366b4aabfe210e7fdc3eb6b7d Mon Sep 17 00:00:00 2001 From: Senthil Kumaran Date: Thu, 17 Mar 2011 17:01:45 +0800 Subject: [PATCH 27/30] Error message in http.server code. Missed to update in 3.1 branch initially. --- Lib/http/server.py | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/Lib/http/server.py b/Lib/http/server.py index 8de604a739e..0cd8d35e4bf 100644 --- a/Lib/http/server.py +++ b/Lib/http/server.py @@ -103,15 +103,20 @@ import copy # Default error message template DEFAULT_ERROR_MESSAGE = """\ - -Error response - - -

Error response

-

Error code %(code)d. -

Message: %(message)s. -

Error code explanation: %(code)s = %(explain)s. - + + + + + Error response + + +

Error response

+

Error code: %(code)d

+

Message: %(message)s.

+

Error code explanation: %(code)s - %(explain)s.

+ + """ DEFAULT_ERROR_CONTENT_TYPE = "text/html;charset=utf-8" From f694a409aadf04e67d4e72a6f8e45dcbe34ab6e5 Mon Sep 17 00:00:00 2001 From: Nick Coghlan Date: Thu, 17 Mar 2011 11:04:34 -0400 Subject: [PATCH 28/30] Give more info in verbose mode when checking crashers, and stress the stack even more in the compiler crasher --- Lib/test/crashers/compiler_recursion.py | 4 ++-- Lib/test/test_crashers.py | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Lib/test/crashers/compiler_recursion.py b/Lib/test/crashers/compiler_recursion.py index 8fd93fcdd49..c00cd6e188e 100644 --- a/Lib/test/crashers/compiler_recursion.py +++ b/Lib/test/crashers/compiler_recursion.py @@ -9,5 +9,5 @@ Recorded on the tracker as http://bugs.python.org/issue11383 # e.g. '1*'*10**5+'1' will die in compiler_visit_expr # The exact limit to destroy the stack will vary by platform -# but 100k should do the trick most places -compile('()'*10**5, '?', 'exec') +# but 1M should do the trick most places +compile('()'*10**6, '?', 'exec') diff --git a/Lib/test/test_crashers.py b/Lib/test/test_crashers.py index ee612c2bc90..86f88f793cf 100644 --- a/Lib/test/test_crashers.py +++ b/Lib/test/test_crashers.py @@ -24,6 +24,8 @@ class CrasherTest(unittest.TestCase): continue # Some "crashers" only trigger an exception rather than a # segfault. Consider that an acceptable outcome. + if test.support.verbose: + print("Checking crasher:", fname) assert_python_failure(fname) From 42ec7cb1050c5d1bdf5d504903fabe8bb372b5da Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Thu, 17 Mar 2011 13:44:18 -0400 Subject: [PATCH 29/30] Issue #10979. unittest stdout buffering now works with class and module setup and teardown. --- Lib/unittest/result.py | 8 +++- Lib/unittest/suite.py | 18 ++++++++- Lib/unittest/test/test_result.py | 67 ++++++++++++++++++++++++++++++++ Misc/NEWS | 3 ++ 4 files changed, 94 insertions(+), 2 deletions(-) diff --git a/Lib/unittest/result.py b/Lib/unittest/result.py index 3dc7154b732..44bf1862e4f 100644 --- a/Lib/unittest/result.py +++ b/Lib/unittest/result.py @@ -59,6 +59,9 @@ class TestResult(object): "Called when the given test is about to be run" self.testsRun += 1 self._mirrorOutput = False + self._setupStdout() + + def _setupStdout(self): if self.buffer: if self._stderr_buffer is None: self._stderr_buffer = io.StringIO() @@ -74,6 +77,10 @@ class TestResult(object): def stopTest(self, test): """Called when the given test has been run""" + self._restoreStdout() + self._mirrorOutput = False + + def _restoreStdout(self): if self.buffer: if self._mirrorOutput: output = sys.stdout.getvalue() @@ -93,7 +100,6 @@ class TestResult(object): self._stdout_buffer.truncate() self._stderr_buffer.seek(0) self._stderr_buffer.truncate() - self._mirrorOutput = False def stopTestRun(self): """Called once after all tests are executed. diff --git a/Lib/unittest/suite.py b/Lib/unittest/suite.py index 77ce0891873..38bd6b861df 100644 --- a/Lib/unittest/suite.py +++ b/Lib/unittest/suite.py @@ -8,6 +8,11 @@ from . import util __unittest = True +def _call_if_exists(parent, attr): + func = getattr(parent, attr, lambda: None) + func() + + class BaseTestSuite(object): """A simple test suite that doesn't provide class or module shared fixtures. """ @@ -133,6 +138,7 @@ class TestSuite(BaseTestSuite): setUpClass = getattr(currentClass, 'setUpClass', None) if setUpClass is not None: + _call_if_exists(result, '_setupStdout') try: setUpClass() except Exception as e: @@ -142,6 +148,8 @@ class TestSuite(BaseTestSuite): className = util.strclass(currentClass) errorName = 'setUpClass (%s)' % className self._addClassOrModuleLevelException(result, e, errorName) + finally: + _call_if_exists(result, '_restoreStdout') def _get_previous_module(self, result): previousModule = None @@ -167,6 +175,7 @@ class TestSuite(BaseTestSuite): return setUpModule = getattr(module, 'setUpModule', None) if setUpModule is not None: + _call_if_exists(result, '_setupStdout') try: setUpModule() except Exception as e: @@ -175,6 +184,8 @@ class TestSuite(BaseTestSuite): result._moduleSetUpFailed = True errorName = 'setUpModule (%s)' % currentModule self._addClassOrModuleLevelException(result, e, errorName) + finally: + _call_if_exists(result, '_restoreStdout') def _addClassOrModuleLevelException(self, result, exception, errorName): error = _ErrorHolder(errorName) @@ -198,6 +209,7 @@ class TestSuite(BaseTestSuite): tearDownModule = getattr(module, 'tearDownModule', None) if tearDownModule is not None: + _call_if_exists(result, '_setupStdout') try: tearDownModule() except Exception as e: @@ -205,6 +217,8 @@ class TestSuite(BaseTestSuite): raise errorName = 'tearDownModule (%s)' % previousModule self._addClassOrModuleLevelException(result, e, errorName) + finally: + _call_if_exists(result, '_restoreStdout') def _tearDownPreviousClass(self, test, result): previousClass = getattr(result, '_previousTestClass', None) @@ -220,6 +234,7 @@ class TestSuite(BaseTestSuite): tearDownClass = getattr(previousClass, 'tearDownClass', None) if tearDownClass is not None: + _call_if_exists(result, '_setupStdout') try: tearDownClass() except Exception as e: @@ -228,7 +243,8 @@ class TestSuite(BaseTestSuite): className = util.strclass(previousClass) errorName = 'tearDownClass (%s)' % className self._addClassOrModuleLevelException(result, e, errorName) - + finally: + _call_if_exists(result, '_restoreStdout') class _ErrorHolder(object): diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py index 64798a1098e..1c58e61bb2b 100644 --- a/Lib/unittest/test/test_result.py +++ b/Lib/unittest/test/test_result.py @@ -497,5 +497,72 @@ class TestOutputBuffering(unittest.TestCase): self.assertEqual(result._original_stderr.getvalue(), expectedErrMessage) self.assertMultiLineEqual(message, expectedFullMessage) + def testBufferSetupClass(self): + result = unittest.TestResult() + result.buffer = True + + class Foo(unittest.TestCase): + @classmethod + def setUpClass(cls): + 1/0 + def test_foo(self): + pass + suite = unittest.TestSuite([Foo('test_foo')]) + suite(result) + self.assertEqual(len(result.errors), 1) + + def testBufferTearDownClass(self): + result = unittest.TestResult() + result.buffer = True + + class Foo(unittest.TestCase): + @classmethod + def tearDownClass(cls): + 1/0 + def test_foo(self): + pass + suite = unittest.TestSuite([Foo('test_foo')]) + suite(result) + self.assertEqual(len(result.errors), 1) + + def testBufferSetUpModule(self): + result = unittest.TestResult() + result.buffer = True + + class Foo(unittest.TestCase): + def test_foo(self): + pass + class Module(object): + @staticmethod + def setUpModule(): + 1/0 + + Foo.__module__ = 'Module' + sys.modules['Module'] = Module + self.addCleanup(sys.modules.pop, 'Module') + suite = unittest.TestSuite([Foo('test_foo')]) + suite(result) + self.assertEqual(len(result.errors), 1) + + def testBufferTearDownModule(self): + result = unittest.TestResult() + result.buffer = True + + class Foo(unittest.TestCase): + def test_foo(self): + pass + class Module(object): + @staticmethod + def tearDownModule(): + 1/0 + + Foo.__module__ = 'Module' + sys.modules['Module'] = Module + self.addCleanup(sys.modules.pop, 'Module') + suite = unittest.TestSuite([Foo('test_foo')]) + suite(result) + self.assertEqual(len(result.errors), 1) + + if __name__ == '__main__': unittest.main() diff --git a/Misc/NEWS b/Misc/NEWS index 1bce6681c61..6d6ba33cf27 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ What's New in Python 3.2.1? Core and Builtins ----------------- +- Issue #10979: unittest stdout buffering now works with class and module + setup and teardown. + - Issue #11510: Fixed optimizer bug which turned "a,b={1,1}" into "a,b=(1,1)". - Issue #11432: A bug was introduced in subprocess.Popen on posix systems with From f40834f39b7bf1e667fbe040fe869232d2488f60 Mon Sep 17 00:00:00 2001 From: Michael Foord Date: Thu, 17 Mar 2011 13:47:12 -0400 Subject: [PATCH 30/30] Move NEWS entry to correct place --- Misc/NEWS | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 6d6ba33cf27..432441a8a5b 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,9 +10,6 @@ What's New in Python 3.2.1? Core and Builtins ----------------- -- Issue #10979: unittest stdout buffering now works with class and module - setup and teardown. - - Issue #11510: Fixed optimizer bug which turned "a,b={1,1}" into "a,b=(1,1)". - Issue #11432: A bug was introduced in subprocess.Popen on posix systems with @@ -43,6 +40,10 @@ Core and Builtins Library ------- + +- Issue #10979: unittest stdout buffering now works with class and module + setup and teardown. + - Issue #11577: fix ResourceWarning triggered by improved binhex test coverage - Issue #11243: fix the parameter querying methods of Message to work if