Mailman 3 December 2010 - Python-checkins

r87516 - python/branches/py3k/Lib/test/regrtest.py
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Date: Mon Dec 27 21:09:32 2010 New Revision: 87516 Log: #7056: runtest and runtest_inner don't use testdir, so drop it from their sigs I've only tested regular runs and -j runs. If I've broken anything else I'm sure I'll hear about it sooner or later. Modified: python/branches/py3k/Lib/test/regrtest.py Modified: python/branches/py3k/Lib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/test/regrtest.py (original) +++ python/branches/py3k/Lib/test/regrtest.py Mon Dec 27 21:09:32 2010 @@ -527,7 +527,7 @@ def tests_and_args(): for test in tests: args_tuple = ( - (test, verbose, quiet, testdir), + (test, verbose, quiet), dict(huntrleaks=huntrleaks, use_resources=use_resources, debug=debug) ) @@ -599,16 +599,15 @@ if trace: # If we're tracing code coverage, then we don't exit with status # if on a false return value from main. - tracer.runctx('runtest(test, verbose, quiet, testdir)', + tracer.runctx('runtest(test, verbose, quiet)', globals=globals(), locals=vars()) else: try: - result = runtest(test, verbose, quiet, - testdir, huntrleaks, debug) + result = runtest(test, verbose, quiet, huntrleaks, debug) accumulate_result(test, result) if verbose3 and result[0] == FAILED: print("Re-running test {} in verbose mode".format(test)) - runtest(test, True, quiet, testdir, huntrleaks, debug) + runtest(test, True, quiet, huntrleaks, debug) except KeyboardInterrupt: interrupted = True break @@ -678,8 +677,7 @@ sys.stdout.flush() try: verbose = True - ok = runtest(test, True, quiet, testdir, - huntrleaks, debug) + ok = runtest(test, True, quiet, huntrleaks, debug) except KeyboardInterrupt: # print a newline separate from the ^C print() @@ -745,14 +743,13 @@ errors="backslashreplace") def runtest(test, verbose, quiet, - testdir=None, huntrleaks=False, debug=False, use_resources=None): + huntrleaks=False, debug=False, use_resources=None): """Run a single test. test -- the name of the test verbose -- if true, print more messages quiet -- if true, don't print 'skipped' messages (probably redundant) test_times -- a list of (time, test_name) pairs - testdir -- test directory huntrleaks -- run multiple times to test for leaks; requires a debug build; a triple corresponding to -R's three arguments @@ -769,8 +766,7 @@ if use_resources is not None: support.use_resources = use_resources try: - return runtest_inner(test, verbose, quiet, - testdir, huntrleaks, debug) + return runtest_inner(test, verbose, quiet, huntrleaks, debug) finally: cleanup_test_droppings(test, verbose) @@ -931,10 +927,8 @@ return False -def runtest_inner(test, verbose, quiet, - testdir=None, huntrleaks=False, debug=False): +def runtest_inner(test, verbose, quiet, huntrleaks=False, debug=False): support.unload(test) - testdir = findtestdir(testdir) if verbose: capture_stdout = None else:

1 0

r87515 - in python/branches/release27-maint: Lib/email/charset.py Lib/email/test/test_email.py Misc/NEWS
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Date: Mon Dec 27 20:17:17 2010 New Revision: 87515 Log: #1379416: encode charset name to ascii to avoid unicode promotion of output Modified: python/branches/release27-maint/Lib/email/charset.py python/branches/release27-maint/Lib/email/test/test_email.py python/branches/release27-maint/Misc/NEWS Modified: python/branches/release27-maint/Lib/email/charset.py ============================================================================== --- python/branches/release27-maint/Lib/email/charset.py (original) +++ python/branches/release27-maint/Lib/email/charset.py Mon Dec 27 20:17:17 2010 @@ -209,7 +209,7 @@ input_charset = unicode(input_charset, 'ascii') except UnicodeError: raise errors.CharsetError(input_charset) - input_charset = input_charset.lower() + input_charset = input_charset.lower().encode('ascii') # Set the input charset after filtering through the aliases and/or codecs if not (input_charset in ALIASES or input_charset in CHARSETS): try: Modified: python/branches/release27-maint/Lib/email/test/test_email.py ============================================================================== --- python/branches/release27-maint/Lib/email/test/test_email.py (original) +++ python/branches/release27-maint/Lib/email/test/test_email.py Mon Dec 27 20:17:17 2010 @@ -3140,6 +3140,13 @@ 'attachment; filename*="iso-8859-1\'\'Fu%DFballer.ppt"', msg['Content-Disposition']) + def test_encode_unaliased_charset(self): + # Issue 1379416: when the charset has no output conversion, + # output was accidentally getting coerced to unicode. + res = Header('abc','iso-8859-2').encode() + self.assertEqual(res, '=?iso-8859-2?q?abc?=') + self.assertIsInstance(res, str) + # Test RFC 2231 header parameters (en/de)coding class TestRFC2231(TestEmailBase): Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Mon Dec 27 20:17:17 2010 @@ -22,6 +22,9 @@ Library ------- +- Issue #1379416: eliminated a source of accidental unicode promotion in + email.header.Header.encode. + - Issue #5258/#10642: if site.py encounters a .pth file that generates an error, it now prints the filename, line number, and traceback to stderr and skips the rest of that individual file, instead of stopping processing entirely.

1 0

r87514 - python/branches/py3k/Misc/NEWS
by vinay.sajip Dec. 27, 2010

Dec. 27, 2010

Author: vinay.sajip Date: Mon Dec 27 19:34:25 2010 New Revision: 87514 Log: Issue #10626: test_logging now preserves logger disabled states. Modified: python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Dec 27 19:34:25 2010 @@ -11,6 +11,10 @@ Library ------- +- Issue #10626: test_logging now preserves logger disabled states. + +- Issue #10774: test_logging now removes temp files created during tests. + - Issue #5258/#10642: if site.py encounters a .pth file that generates an error, it now prints the filename, line number, and traceback to stderr and skips the rest of that individual file, instead of stopping processing entirely. @@ -55,8 +59,6 @@ Library ------- -- Issue #10774: test_logging now removes temp files created during tests. - - Issue #3243: Support iterable bodies in httplib. Patch Contributions by Xuanji Li and Chris AtLee.

1 0

r87500 - svn:log
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Revision: 87500 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -4,10 +4,13 @@ ........ r87497 | r.david.murray | 2010-12-26 14:54:29 -0500 (Sun, 26 Dec 2010) | 7 lines - ##5258/#10642: print fn, line, traceback and continue when .pth file is broken + #5258/#10642: print fn, line, traceback and continue when .pth file is broken - Previously site.py would end with a traceback and not complete the - initialization of site-packages, but the interpreter would start. - now site.py does as much initialization as it can, while reporting - more useful information to help debug the problem in the .pth file. + If a .pth file contained an error, it could cause a traceback in site.py, + terminating its processing. In 2.7 and 3.2, the interpreter will then not + start. Previously, a message would print saying to use -v to get the + traceback. In either case, the traceback generated for a failed .pth file did + not include the .pth filename, making it difficult to debug the problem. Now + site.py reports not only the .pth filename but also the line number causing the + error, and just skips the remainder of the file. ........

1 0

r87497 - svn:log
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Revision: 87497 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,4 +1,4 @@ -##5258/#10642: print fn, line, traceback and continue when .pth file is broken +#5258/#10642: print fn, line, traceback and continue when .pth file is broken If a .pth file contained an error, it could cause a traceback in site.py, terminating its processing. In 2.7 and 3.2, the interpreter will then not @@ -6,5 +6,4 @@ traceback. In either case, the traceback generated for a failed .pth file did not include the .pth filename, making it difficult to debug the problem. Now site.py reports not only the .pth filename but also the line number causing the -error, and just skips the remainder of the file. (The interpreter failing to -start in 2.7/3.2 if site.py fails is a separate issue). +error, and just skips the remainder of the file.

1 0

r87499 - svn:log
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Revision: 87499 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -4,10 +4,13 @@ ........ r87497 | r.david.murray | 2010-12-26 14:54:29 -0500 (Sun, 26 Dec 2010) | 7 lines - ##5258/#10642: print fn, line, traceback and continue when .pth file is broken - - Previously site.py would end with a traceback and not complete the - initialization of site-packages, but the interpreter would start. - now site.py does as much initialization as it can, while reporting - more useful information to help debug the problem in the .pth file. + #5258/#10642: print fn, line, traceback and continue when .pth file is broken + + If a .pth file contained an error, it could cause a traceback in site.py, + terminating its processing. In 2.7 and 3.2, the interpreter will then not + start. Previously, a message would print saying to use -v to get the + traceback. In either case, the traceback generated for a failed .pth file did + not include the .pth filename, making it difficult to debug the problem. Now + site.py reports not only the .pth filename but also the line number causing the + error, and just skips the remainder of the file. ........

1 0

r87497 - svn:log
by r.david.murray Dec. 27, 2010

Dec. 27, 2010

Author: r.david.murray Revision: 87497 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,6 +1,10 @@ ##5258/#10642: print fn, line, traceback and continue when .pth file is broken -Previously site.py would end with a traceback and not complete the -initialization of site-packages, but the interpreter would start. -now site.py does as much initialization as it can, while reporting -more useful information to help debug the problem in the .pth file. +If a .pth file contained an error, it could cause a traceback in site.py, +terminating its processing. In 2.7 and 3.2, the interpreter will then not +start. Previously, a message would print saying to use -v to get the +traceback. In either case, the traceback generated for a failed .pth file did +not include the .pth filename, making it difficult to debug the problem. Now +site.py reports not only the .pth filename but also the line number causing the +error, and just skips the remainder of the file. (The interpreter failing to +start in 2.7/3.2 if site.py fails is a separate issue).

1 0

r87513 - python/branches/py3k/Lib/test/test_logging.py
by vinay.sajip Dec. 27, 2010

Dec. 27, 2010

Author: vinay.sajip Date: Mon Dec 27 15:31:52 2010 New Revision: 87513 Log: Issue #10626: test_logging now preserves logger disabled states. Modified: python/branches/py3k/Lib/test/test_logging.py Modified: python/branches/py3k/Lib/test/test_logging.py ============================================================================== --- python/branches/py3k/Lib/test/test_logging.py (original) +++ python/branches/py3k/Lib/test/test_logging.py Mon Dec 27 15:31:52 2010 @@ -67,8 +67,12 @@ try: self.saved_handlers = logging._handlers.copy() self.saved_handler_list = logging._handlerList[:] - self.saved_loggers = logger_dict.copy() + self.saved_loggers = saved_loggers = logger_dict.copy() self.saved_level_names = logging._levelNames.copy() + self.logger_states = logger_states = {} + for name in saved_loggers: + logger_states[name] = getattr(saved_loggers[name], + 'disabled', None) finally: logging._releaseLock() @@ -112,6 +116,10 @@ loggerDict = logging.getLogger().manager.loggerDict loggerDict.clear() loggerDict.update(self.saved_loggers) + logger_states = self.logger_states + for name in self.logger_states: + if logger_states[name] is not None: + self.saved_loggers[name].disabled = logger_states[name] finally: logging._releaseLock()

1 0

r87512 - in python/branches/py3k: Lib/test/test_logging.py Misc/NEWS
by vinay.sajip Dec. 27, 2010

Dec. 27, 2010

Author: vinay.sajip Date: Mon Dec 27 12:18:52 2010 New Revision: 87512 Log: Issue #10774: test_logging now removes temp files created during tests. Modified: python/branches/py3k/Lib/test/test_logging.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/test/test_logging.py ============================================================================== --- python/branches/py3k/Lib/test/test_logging.py (original) +++ python/branches/py3k/Lib/test/test_logging.py Mon Dec 27 12:18:52 2010 @@ -907,7 +907,8 @@ def test_encoding_plain_file(self): # In Python 2.x, a plain file object is treated as having no encoding. log = logging.getLogger("test") - fn = tempfile.mktemp(".log", "test_logging-1-") + fd, fn = tempfile.mkstemp(".log", "test_logging-1-") + os.close(fd) # the non-ascii data we write to the log. data = "foo\x80" try: @@ -1885,7 +1886,7 @@ return logging.makeLogRecord(result) def test_percent(self): - "Test %-formatting" + # Test %-formatting r = self.get_record() f = logging.Formatter('${%(message)s}') self.assertEqual(f.format(r), '${Message with 2 placeholders}') @@ -1898,7 +1899,7 @@ self.assertFalse(f.usesTime()) def test_braces(self): - "Test {}-formatting" + # Test {}-formatting r = self.get_record() f = logging.Formatter('$%{message}%$', style='{') self.assertEqual(f.format(r), '$%Message with 2 placeholders%$') @@ -1911,7 +1912,7 @@ self.assertFalse(f.usesTime()) def test_dollars(self): - "Test $-formatting" + # Test $-formatting r = self.get_record() f = logging.Formatter('$message', style='$') self.assertEqual(f.format(r), 'Message with 2 placeholders') @@ -1929,7 +1930,7 @@ class LastResortTest(BaseTest): def test_last_resort(self): - "Test the last resort handler" + # Test the last resort handler root = self.root_logger root.removeHandler(self.root_hdlr) old_stderr = sys.stderr @@ -1966,12 +1967,15 @@ def setUp(self): BaseTest.setUp(self) - self.fn = tempfile.mktemp(".log", "test_logging-2-") + fd, self.fn = tempfile.mkstemp(".log", "test_logging-2-") + os.close(fd) self.rmfiles = [] def tearDown(self): for fn in self.rmfiles: os.unlink(fn) + if os.path.exists(self.fn): + os.unlink(self.fn) BaseTest.tearDown(self) def assertLogFile(self, filename): @@ -2000,7 +2004,6 @@ def test_file_created(self): # checks that the file is created and assumes it was created # by us - self.assertFalse(os.path.exists(self.fn)) rh = logging.handlers.RotatingFileHandler(self.fn) rh.emit(self.next_rec()) self.assertLogFile(self.fn) Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Dec 27 12:18:52 2010 @@ -55,6 +55,8 @@ Library ------- +- Issue #10774: test_logging now removes temp files created during tests. + - Issue #3243: Support iterable bodies in httplib. Patch Contributions by Xuanji Li and Chris AtLee.

1 0

r87445 - python/branches/py3k/Lib/numbers.py
by eric.araujo Dec. 27, 2010

Dec. 27, 2010

Author: eric.araujo Date: Thu Dec 23 19:41:33 2010 New Revision: 87445 Log: Fix small inaccuracy: there is no index function Modified: python/branches/py3k/Lib/numbers.py Modified: python/branches/py3k/Lib/numbers.py ============================================================================== --- python/branches/py3k/Lib/numbers.py (original) +++ python/branches/py3k/Lib/numbers.py Thu Dec 23 19:41:33 2010 @@ -303,7 +303,7 @@ raise NotImplementedError def __index__(self): - """index(self)""" + """someobject[self]""" return int(self) @abstractmethod

3 2