Mailman 3 March 2010 - Python-checkins

r79480 - python/trunk/Doc/library/itertools.rst
by raymond.hettinger 28 Mar '10

28 Mar '10

Author: raymond.hettinger Date: Sun Mar 28 20:02:41 2010 New Revision: 79480 Log: Update itertools recipes. Modified: python/trunk/Doc/library/itertools.rst Modified: python/trunk/Doc/library/itertools.rst ============================================================================== --- python/trunk/Doc/library/itertools.rst (original) +++ python/trunk/Doc/library/itertools.rst Sun Mar 28 20:02:41 2010 @@ -666,9 +666,6 @@ "Return first n items of the iterable as a list" return list(islice(iterable, n)) - def enumerate(iterable, start=0): - return izip(count(start), iterable) - def tabulate(function, start=0): "Return function(0), function(1), ..." return imap(function, count(start)) @@ -747,10 +744,9 @@ seen = set() seen_add = seen.add if key is None: - for element in iterable: - if element not in seen: - seen_add(element) - yield element + for element in ifilterfalse(seen.__contains__, iterable): + seen_add(element) + yield element else: for element in iterable: k = key(element) @@ -763,3 +759,28 @@ # unique_justseen('AAAABBBCCDAABBB') --> A B C D A B # unique_justseen('ABBCcAD', str.lower) --> A B C A D return imap(next, imap(itemgetter(1), groupby(iterable, key))) + + def iter_except(func, exception, first=None): + """ Call a function repeatedly until an exception is raised. + + Converts a call-until-exception interface to an iterator interface. + Like __builtin__.iter(func, sentinel) but uses an exception instead + of a sentinel to end the loop. + + Examples: + bsddbiter = iter_except(db.next, bsddb.error, db.first) + heapiter = iter_except(functools.partial(heappop, h), IndexError) + dictiter = iter_except(d.popitem, KeyError) + dequeiter = iter_except(d.popleft, IndexError) + queueiter = iter_except(q.get_nowait, Queue.Empty) + setiter = iter_except(s.pop, KeyError) + + """ + try: + if first is not None: + yield first() + while 1: + yield func() + except exception: + pass +

1 0

r79479 - in python/branches/release31-maint: Doc/reference/lexical_analysis.rst Lib/idlelib/PyShell.py Lib/macpath.py Lib/multiprocessing/forking.py Lib/multiprocessing/pool.py Lib/multiprocessing/process.py Lib/ntpath.py Lib/test/regrtest.py Lib/test/test_httpservers.py Lib/test/test_multiprocessing.py Lib/test/test_warnings.py Lib/turtle.py Misc/NEWS
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 13:42:38 2010 New Revision: 79479 Log: Note: only the relevant parts of r79474 are merged. Merged revisions 78793,78798-78799,78977,79095,79196,79474 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78793 | florent.xicluna | 2010-03-08 13:25:35 +0100 (lun, 08 mar 2010) | 2 lines Fix macpath to deal with bytes ................ r78798 | florent.xicluna | 2010-03-08 14:32:17 +0100 (lun, 08 mar 2010) | 18 lines Merged revisions 78777,78787,78790 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78777 | florent.xicluna | 2010-03-08 00:49:03 +0100 (lun, 08 mar 2010) | 4 lines Backport the Popen.poll() protection from subprocess to multiprocessing. See #1731717. It should fix transient failures on test_multiprocessing. ........ r78787 | florent.xicluna | 2010-03-08 08:21:16 +0100 (lun, 08 mar 2010) | 2 lines Don't fail on a debug() statement, if the worker PID is (still) None. ........ r78790 | florent.xicluna | 2010-03-08 12:01:39 +0100 (lun, 08 mar 2010) | 2 lines On finalize, don't try to join not started process. ........ ................ r78799 | florent.xicluna | 2010-03-08 15:44:41 +0100 (lun, 08 mar 2010) | 2 lines Fix ntpath abspath to deal with bytes. ................ r78977 | florent.xicluna | 2010-03-15 14:14:39 +0100 (lun, 15 mar 2010) | 2 lines Fix \xhh specs, #1889. (an oversight of r60193, r60210). ................ r79095 | florent.xicluna | 2010-03-19 15:40:31 +0100 (ven, 19 mar 2010) | 2 lines Rename test.test_support to test.support for 3.x. ................ r79196 | florent.xicluna | 2010-03-21 13:29:50 +0100 (dim, 21 mar 2010) | 9 lines Merged revisions 79195 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79195 | florent.xicluna | 2010-03-21 13:27:20 +0100 (dim, 21 mar 2010) | 2 lines Issue #8179: Fix macpath.realpath() on a non-existing path. ........ ................ r79474 | florent.xicluna | 2010-03-28 01:25:02 +0100 (dim, 28 mar 2010) | 33 lines Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes. ........ r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only). ........ r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available. ........ r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines Syntax cleanup `== None` -> `is None` ........ r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines #8207: Fix test_pep277 on OS X ........ r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest" ........ r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines Ensure that the failed or unexpected tests are sorted before printing. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Doc/reference/lexical_analysis.rst python/branches/release31-maint/Lib/idlelib/PyShell.py python/branches/release31-maint/Lib/macpath.py python/branches/release31-maint/Lib/multiprocessing/forking.py python/branches/release31-maint/Lib/multiprocessing/pool.py python/branches/release31-maint/Lib/multiprocessing/process.py python/branches/release31-maint/Lib/ntpath.py python/branches/release31-maint/Lib/test/regrtest.py python/branches/release31-maint/Lib/test/test_httpservers.py python/branches/release31-maint/Lib/test/test_multiprocessing.py python/branches/release31-maint/Lib/test/test_warnings.py python/branches/release31-maint/Lib/turtle.py python/branches/release31-maint/Misc/NEWS Modified: python/branches/release31-maint/Doc/reference/lexical_analysis.rst ============================================================================== --- python/branches/release31-maint/Doc/reference/lexical_analysis.rst (original) +++ python/branches/release31-maint/Doc/reference/lexical_analysis.rst Sun Mar 28 13:42:38 2010 @@ -503,7 +503,7 @@ As in Standard C, up to three octal digits are accepted. (2) - Unlike in Standard C, at most two hex digits are accepted. + Unlike in Standard C, exactly two hex digits are required. (3) In a bytes literal, hexadecimal and octal escapes denote the byte with the Modified: python/branches/release31-maint/Lib/idlelib/PyShell.py ============================================================================== --- python/branches/release31-maint/Lib/idlelib/PyShell.py (original) +++ python/branches/release31-maint/Lib/idlelib/PyShell.py Sun Mar 28 13:42:38 2010 @@ -347,7 +347,7 @@ rpcpid = None def spawn_subprocess(self): - if self.subprocess_arglist == None: + if self.subprocess_arglist is None: self.subprocess_arglist = self.build_subprocess_arglist() args = self.subprocess_arglist self.rpcpid = os.spawnv(os.P_NOWAIT, sys.executable, args) Modified: python/branches/release31-maint/Lib/macpath.py ============================================================================== --- python/branches/release31-maint/Lib/macpath.py (original) +++ python/branches/release31-maint/Lib/macpath.py Sun Mar 28 13:42:38 2010 @@ -172,7 +172,11 @@ def abspath(path): """Return an absolute path.""" if not isabs(path): - path = join(os.getcwd(), path) + if isinstance(path, bytes): + cwd = os.getcwdb() + else: + cwd = os.getcwd() + path = join(cwd, path) return normpath(path) # realpath is a no-op on systems without islink support @@ -189,7 +193,10 @@ path = components[0] + colon for c in components[1:]: path = join(path, c) - path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname() + try: + path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname() + except Carbon.File.Error: + pass return path supports_unicode_filenames = False Modified: python/branches/release31-maint/Lib/multiprocessing/forking.py ============================================================================== --- python/branches/release31-maint/Lib/multiprocessing/forking.py (original) +++ python/branches/release31-maint/Lib/multiprocessing/forking.py Sun Mar 28 13:42:38 2010 @@ -104,7 +104,12 @@ def poll(self, flag=os.WNOHANG): if self.returncode is None: - pid, sts = os.waitpid(self.pid, flag) + try: + pid, sts = os.waitpid(self.pid, flag) + except os.error: + # Child process not yet created. See #1731717 + # e.errno == errno.ECHILD == 10 + return None if pid == self.pid: if os.WIFSIGNALED(sts): self.returncode = -os.WTERMSIG(sts) Modified: python/branches/release31-maint/Lib/multiprocessing/pool.py ============================================================================== --- python/branches/release31-maint/Lib/multiprocessing/pool.py (original) +++ python/branches/release31-maint/Lib/multiprocessing/pool.py Sun Mar 28 13:42:38 2010 @@ -387,7 +387,10 @@ if pool and hasattr(pool[0], 'terminate'): debug('joining pool workers') for p in pool: - p.join() + if p.is_alive(): + # worker has not yet exited + debug('cleaning up worker %d' % p.pid) + p.join() # # Class whose instances are returned by `Pool.apply_async()` Modified: python/branches/release31-maint/Lib/multiprocessing/process.py ============================================================================== --- python/branches/release31-maint/Lib/multiprocessing/process.py (original) +++ python/branches/release31-maint/Lib/multiprocessing/process.py Sun Mar 28 13:42:38 2010 @@ -179,7 +179,7 @@ @property def ident(self): ''' - Return indentifier (PID) of process or `None` if it has yet to start + Return identifier (PID) of process or `None` if it has yet to start ''' if self is _current_process: return os.getpid() Modified: python/branches/release31-maint/Lib/ntpath.py ============================================================================== --- python/branches/release31-maint/Lib/ntpath.py (original) +++ python/branches/release31-maint/Lib/ntpath.py Sun Mar 28 13:42:38 2010 @@ -561,6 +561,8 @@ path = _getfullpathname(path) except WindowsError: pass # Bad path - return unchanged. + elif isinstance(path, bytes): + path = os.getcwdb() else: path = os.getcwd() return normpath(path) Modified: python/branches/release31-maint/Lib/test/regrtest.py ============================================================================== --- python/branches/release31-maint/Lib/test/regrtest.py (original) +++ python/branches/release31-maint/Lib/test/regrtest.py Sun Mar 28 13:42:38 2010 @@ -453,11 +453,6 @@ if module not in save_modules and module.startswith("test."): support.unload(module) - # The lists won't be sorted if running with -r - good.sort() - bad.sort() - skipped.sort() - if good and not quiet: if not bad and not skipped and len(good) > 1: print("All", end=' ') @@ -893,7 +888,8 @@ from textwrap import fill blanks = ' ' * indent - print(fill(' '.join(map(str, x)), width, + # Print the sorted list: 'x' may be a '--random' list or a set() + print(fill(' '.join(str(elt) for elt in sorted(x)), width, initial_indent=blanks, subsequent_indent=blanks)) # Map sys.platform to a string containing the basenames of tests Modified: python/branches/release31-maint/Lib/test/test_httpservers.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_httpservers.py (original) +++ python/branches/release31-maint/Lib/test/test_httpservers.py Sun Mar 28 13:42:38 2010 @@ -294,14 +294,22 @@ self.cgi_dir = os.path.join(self.parent_dir, 'cgi-bin') os.mkdir(self.cgi_dir) + # The shebang line should be pure ASCII: use symlink if possible. + # See issue #7668. + if hasattr(os, 'symlink'): + self.pythonexe = os.path.join(self.parent_dir, 'python') + os.symlink(sys.executable, self.pythonexe) + else: + self.pythonexe = sys.executable + self.file1_path = os.path.join(self.cgi_dir, 'file1.py') with open(self.file1_path, 'w') as file1: - file1.write(cgi_file1 % sys.executable) + file1.write(cgi_file1 % self.pythonexe) os.chmod(self.file1_path, 0o777) self.file2_path = os.path.join(self.cgi_dir, 'file2.py') with open(self.file2_path, 'w') as file2: - file2.write(cgi_file2 % sys.executable) + file2.write(cgi_file2 % self.pythonexe) os.chmod(self.file2_path, 0o777) self.cwd = os.getcwd() @@ -310,6 +318,8 @@ def tearDown(self): try: os.chdir(self.cwd) + if self.pythonexe != sys.executable: + os.remove(self.pythonexe) os.remove(self.file1_path) os.remove(self.file2_path) os.rmdir(self.cgi_dir) Modified: python/branches/release31-maint/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_multiprocessing.py (original) +++ python/branches/release31-maint/Lib/test/test_multiprocessing.py Sun Mar 28 13:42:38 2010 @@ -64,6 +64,16 @@ WIN32 = (sys.platform == "win32") # +# Some tests require ctypes +# + +try: + from ctypes import Structure, Value, copy, c_int, c_double +except ImportError: + Structure = object + c_int = c_double = None + +# # Creates a wrapper for a function which records the time it takes to finish # @@ -506,7 +516,7 @@ queue = self.JoinableQueue() if sys.version_info < (2, 5) and not hasattr(queue, 'task_done'): - return + self.skipTest("requires 'queue.task_done()' method") workers = [self.Process(target=self._test_task_done, args=(queue,)) for i in range(4)] @@ -783,6 +793,8 @@ class _TestValue(BaseTestCase): + ALLOWED_TYPES = ('processes',) + codes_values = [ ('i', 4343, 24234), ('d', 3.625, -4.25), @@ -795,10 +807,8 @@ sv.value = cv[2] + @unittest.skipIf(c_int is None, "requires _ctypes") def test_value(self, raw=False): - if self.TYPE != 'processes': - return - if raw: values = [self.RawValue(code, value) for code, value, _ in self.codes_values] @@ -816,13 +826,12 @@ for sv, cv in zip(values, self.codes_values): self.assertEqual(sv.value, cv[2]) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_rawvalue(self): self.test_value(raw=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_getobj_getlock(self): - if self.TYPE != 'processes': - return - val1 = self.Value('i', 5) lock1 = val1.get_lock() obj1 = val1.get_obj() @@ -850,14 +859,14 @@ class _TestArray(BaseTestCase): + ALLOWED_TYPES = ('processes',) + def f(self, seq): for i in range(1, len(seq)): seq[i] += seq[i-1] + @unittest.skipIf(c_int is None, "requires _ctypes") def test_array(self, raw=False): - if self.TYPE != 'processes': - return - seq = [680, 626, 934, 821, 150, 233, 548, 982, 714, 831] if raw: arr = self.RawArray('i', seq) @@ -880,13 +889,12 @@ self.assertEqual(list(arr[:]), seq) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_rawarray(self): self.test_array(raw=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_getobj_getlock_obj(self): - if self.TYPE != 'processes': - return - arr1 = self.Array('i', list(range(10))) lock1 = arr1.get_lock() obj1 = arr1.get_obj() @@ -1538,12 +1546,6 @@ # # -try: - from ctypes import Structure, Value, copy, c_int, c_double -except ImportError: - Structure = object - c_int = c_double = None - class _Foo(Structure): _fields_ = [ ('x', c_int), @@ -1563,10 +1565,8 @@ for i in range(len(arr)): arr[i] *= 2 + @unittest.skipIf(c_int is None, "requires _ctypes") def test_sharedctypes(self, lock=False): - if c_int is None: - return - x = Value('i', 7, lock=lock) y = Value(ctypes.c_double, 1.0/3.0, lock=lock) foo = Value(_Foo, 3, 2, lock=lock) @@ -1589,10 +1589,8 @@ def test_synchronize(self): self.test_sharedctypes(lock=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_copy(self): - if c_int is None: - return - foo = _Foo(2, 5.0) bar = copy(foo) foo.x = 0 @@ -1664,13 +1662,17 @@ ALLOWED_TYPES = ('processes',) def test_import(self): - modules = ( + modules = [ 'multiprocessing', 'multiprocessing.connection', 'multiprocessing.heap', 'multiprocessing.managers', 'multiprocessing.pool', 'multiprocessing.process', - 'multiprocessing.reduction', 'multiprocessing.sharedctypes', + 'multiprocessing.reduction', 'multiprocessing.synchronize', 'multiprocessing.util' - ) + ] + + if c_int is not None: + # This module requires _ctypes + modules.append('multiprocessing.sharedctypes') for name in modules: __import__(name) @@ -1730,12 +1732,12 @@ class TestInvalidHandle(unittest.TestCase): + @unittest.skipIf(WIN32, "skipped on Windows") def test_invalid_handles(self): - if WIN32: - return conn = _multiprocessing.Connection(44977608) self.assertRaises(IOError, conn.poll) self.assertRaises(IOError, _multiprocessing.Connection, -1) + # # Functions used to create test cases from the base ones in this module # @@ -1752,7 +1754,7 @@ def create_test_cases(Mixin, type): result = {} glob = globals() - Type = type[0].upper() + type[1:] + Type = type.capitalize() for name in list(glob.keys()): if name.startswith('_Test'): Modified: python/branches/release31-maint/Lib/test/test_warnings.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_warnings.py (original) +++ python/branches/release31-maint/Lib/test/test_warnings.py Sun Mar 28 13:42:38 2010 @@ -27,11 +27,15 @@ except NameError: pass original_warnings = warning_tests.warnings + original_filters = module.filters try: + module.filters = original_filters[:] + module.simplefilter("once") warning_tests.warnings = module yield finally: warning_tests.warnings = original_warnings + module.filters = original_filters class BaseTest(unittest.TestCase): @@ -194,6 +198,7 @@ def test_message(self): with original_warnings.catch_warnings(record=True, module=self.module) as w: + self.module.simplefilter("once") for i in range(4): text = 'multi %d' %i # Different text on each call. self.module.warn(text) @@ -206,6 +211,7 @@ for ob in (Warning, None, 42): with original_warnings.catch_warnings(record=True, module=self.module) as w: + self.module.simplefilter("once") self.module.warn(ob) # Don't directly compare objects since # ``Warning() != Warning()``. Modified: python/branches/release31-maint/Lib/turtle.py ============================================================================== --- python/branches/release31-maint/Lib/turtle.py (original) +++ python/branches/release31-maint/Lib/turtle.py Sun Mar 28 13:42:38 2010 @@ -778,7 +778,7 @@ # needs amendment if not isinstance(self.cv, ScrolledCanvas): return self.canvwidth, self.canvheight - if canvwidth is None and canvheight is None and bg is None: + if canvwidth is canvheight is bg is None: return self.cv.canvwidth, self.cv.canvheight if canvwidth is not None: self.canvwidth = canvwidth @@ -1046,7 +1046,7 @@ >>> mode() 'logo' """ - if mode == None: + if mode is None: return self._mode mode = mode.lower() if mode not in ["standard", "logo", "world"]: @@ -1385,7 +1385,7 @@ ### repeatedly pressing the up-arrow key, ### consequently drawing a hexagon """ - if fun == None: + if fun is None: if key in self._keys: self._keys.remove(key) elif key not in self._keys: @@ -1418,7 +1418,7 @@ ### or by keeping pressed the up-arrow key. ### consequently drawing a hexagon. """ - if fun == None: + if fun is None: if key in self._keys: self._keys.remove(key) elif key is not None and key not in self._keys: @@ -1540,7 +1540,7 @@ def _setmode(self, mode=None): """Set turtle-mode to 'standard', 'world' or 'logo'. """ - if mode == None: + if mode is None: return self._mode if mode not in ["standard", "logo", "world"]: return @@ -2795,7 +2795,7 @@ >>> turtle.shapesize(5, 5, 12) >>> turtle.shapesize(outline=8) """ - if stretch_wid is stretch_len is outline == None: + if stretch_wid is stretch_len is outline is None: stretch_wid, stretch_len = self._stretchfactor return stretch_wid, stretch_len, self._outlinewidth if stretch_wid == 0 or stretch_len == 0: Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sun Mar 28 13:42:38 2010 @@ -20,6 +20,8 @@ Library ------- +- Issue #8179: Fix macpath.realpath() on a non-existing path. + - Issue #8139: ossaudiodev didn't initialize its types properly, therefore some methods (such as oss_mixer_device.fileno()) were not available. Initial patch by Bertrand Janin. @@ -452,7 +454,7 @@ test_capi (only seen so far on platforms where the curses module wasn't built), due to an uncleared exception. -- issue #7728: test_timeout was changed to use test_support.bind_port +- issue #7728: test_timeout was changed to use test.support.bind_port instead of a hard coded port. - Issue #7376: instead of running a self-test (which was failing) when called

1 0

r79478 - python/branches/release31-maint
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 13:39:32 2010 New Revision: 79478 Log: Blocked revisions 78499,79472 via svnmerge ................ r78499 | florent.xicluna | 2010-02-27 16:16:59 +0100 (sam, 27 fév 2010) | 8 lines Blocked revisions 78497 via svnmerge ........ r78497 | florent.xicluna | 2010-02-27 16:10:19 +0100 (sam, 27 fév 2010) | 2 lines #7793: Fix RuntimeError when running "regrtest -R" for multibyte codecs. ........ ................ r79472 | florent.xicluna | 2010-03-27 23:18:04 +0100 (sam, 27 mar 2010) | 27 lines Blocked revisions 79288,79295-79296,79334,79378 via svnmerge ........ r79288 | florent.xicluna | 2010-03-22 16:02:46 +0100 (lun, 22 mar 2010) | 2 lines Get rid of buffer() in test_ctypes: backport the 3.x tests. ........ r79295 | florent.xicluna | 2010-03-22 17:07:38 +0100 (lun, 22 mar 2010) | 3 lines Issue #7703: ctypes supports both buffer() and memoryview(). The former is deprecated. Complement of r79288. ........ r79296 | florent.xicluna | 2010-03-22 17:36:51 +0100 (lun, 22 mar 2010) | 3 lines Preserve backward compatibility of the ctypes module. "This file should be kept compatible with Python 2.3, see PEP 291." ........ r79334 | florent.xicluna | 2010-03-23 12:07:54 +0100 (mar, 23 mar 2010) | 2 lines Skip test_format_deprecation if _ctypes is not available. Add a filter to the warning check. ........ r79378 | florent.xicluna | 2010-03-24 18:32:58 +0100 (mer, 24 mar 2010) | 3 lines Skip test_ascii_formatd if _ctypes is not available (BSD, ...). Previous change was incomplete (r79334). ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r79477 - python/branches/release31-maint
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 13:38:06 2010 New Revision: 79477 Log: Blocked revisions 78510,78583,78607,78654-78655,78663,78672,78674,78676,78702,78705,78723-78725,78727,78733,78792,78795-78797,78801,78829,78831,78834,78929,78942,78945,78961,79033,79050,79062,79065,79083,79088,79093-79094,79102,79128,79145,79209,79473 via svnmerge ................ r78510 | florent.xicluna | 2010-02-27 23:12:37 +0100 (sam, 27 fév 2010) | 13 lines Recorded merge of revisions 78508-78509 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78508 | florent.xicluna | 2010-02-27 20:20:50 +0100 (sam, 27 fév 2010) | 2 lines Clean test_subprocess: use assertRaises, skipIf, skipUnless helpers and a custom helper assertStderrEqual. ........ r78509 | florent.xicluna | 2010-02-27 22:15:27 +0100 (sam, 27 fév 2010) | 2 lines Fix an oversight in r78508: p.wait() should be compared to 0 ........ ................ r78583 | florent.xicluna | 2010-03-02 17:06:24 +0100 (mar, 02 mar 2010) | 9 lines Recorded merge of revisions 78582 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78582 | florent.xicluna | 2010-03-02 17:00:00 +0100 (mar, 02 mar 2010) | 2 lines Refactor test_dict using assertRaises. ........ ................ r78607 | florent.xicluna | 2010-03-03 01:06:37 +0100 (mer, 03 mar 2010) | 17 lines Merged revisions 78585,78594,78606 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78585 | florent.xicluna | 2010-03-02 22:34:45 +0100 (mar, 02 mar 2010) | 2 lines Tentatively enable test_pep277 on all platforms. ........ r78594 | florent.xicluna | 2010-03-02 23:34:11 +0100 (mar, 02 mar 2010) | 2 lines Test test_pep277 is only relevant for Unicode-friendly filesystems. ........ r78606 | florent.xicluna | 2010-03-03 00:56:38 +0100 (mer, 03 mar 2010) | 2 lines Fix wording. ........ ................ r78654 | florent.xicluna | 2010-03-04 17:10:10 +0100 (jeu, 04 mar 2010) | 9 lines Merged revisions 78653 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78653 | florent.xicluna | 2010-03-04 16:58:54 +0100 (jeu, 04 mar 2010) | 2 lines #7805: wait until all workers are started before collecting their PIDs ........ ................ r78655 | florent.xicluna | 2010-03-04 17:10:55 +0100 (jeu, 04 mar 2010) | 2 lines Missing part from r78654 ................ r78663 | florent.xicluna | 2010-03-04 22:50:56 +0100 (jeu, 04 mar 2010) | 16 lines Merged revisions 78661-78662 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78661 | florent.xicluna | 2010-03-04 20:40:48 +0100 (jeu, 04 mar 2010) | 2 lines Cleanup. ........ r78662 | florent.xicluna | 2010-03-04 22:31:58 +0100 (jeu, 04 mar 2010) | 2 lines #2777: Enable test_send_signal, test_kill and test_terminate on all platforms. ........ And fix an oversight of changeset 78510. ................ r78672 | florent.xicluna | 2010-03-05 01:52:00 +0100 (ven, 05 mar 2010) | 10 lines Merged revisions 78671 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78671 | florent.xicluna | 2010-03-05 01:47:40 +0100 (ven, 05 mar 2010) | 3 lines Workaround #3137: Retry SIGINT if it is not received the first time. test_send_signal should not hang anymore on various Linux distributions. ........ ................ r78674 | florent.xicluna | 2010-03-05 02:07:40 +0100 (ven, 05 mar 2010) | 2 lines Remove some debug line... ................ r78676 | florent.xicluna | 2010-03-05 02:18:04 +0100 (ven, 05 mar 2010) | 9 lines Merged revisions 78673 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78673 | florent.xicluna | 2010-03-05 02:05:55 +0100 (ven, 05 mar 2010) | 2 lines Let's use assertIsNone / assertIsNotNone. It's hype. ........ ................ r78702 | florent.xicluna | 2010-03-05 21:26:54 +0100 (ven, 05 mar 2010) | 9 lines Merged revisions 78701 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78701 | florent.xicluna | 2010-03-05 20:31:21 +0100 (ven, 05 mar 2010) | 2 lines #2777: Handle fds more carefully to try to fix some x86-Linux failures (namely, neal bot and twisted bot). ........ ................ r78705 | florent.xicluna | 2010-03-06 01:19:38 +0100 (sam, 06 mar 2010) | 9 lines Merged revisions 78704 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78704 | florent.xicluna | 2010-03-06 01:16:57 +0100 (sam, 06 mar 2010) | 2 lines #2777: Apply same recipe for test_terminate and test_kill, i.e. close or redirect fds. ........ ................ r78723 | florent.xicluna | 2010-03-06 12:43:55 +0100 (sam, 06 mar 2010) | 14 lines Merged revisions 78719-78720 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78719 | florent.xicluna | 2010-03-06 09:07:44 +0100 (sam, 06 mar 2010) | 3 lines Keep the test files in the ./build/ subdirectory, if Python is not installed. Remove two hacks which are no longer needed after #7712, because all __file__ attributes are absolute. ........ r78720 | florent.xicluna | 2010-03-06 10:11:55 +0100 (sam, 06 mar 2010) | 2 lines Print platform information to stdout, to help troubleshooting platform-specific failures. ........ ................ r78724 | florent.xicluna | 2010-03-06 12:52:51 +0100 (sam, 06 mar 2010) | 9 lines Merged revisions 78721 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78721 | florent.xicluna | 2010-03-06 10:54:14 +0100 (sam, 06 mar 2010) | 2 lines #2777: Apply same recipe on win32, i.e. do not inherit file handles. ........ ................ r78725 | florent.xicluna | 2010-03-06 15:04:16 +0100 (sam, 06 mar 2010) | 2 lines Fix test_pydoc when sys.modules["test"] is first imported using importlib.import_module. ................ r78727 | florent.xicluna | 2010-03-06 15:43:34 +0100 (sam, 06 mar 2010) | 2 lines Fix TypeError on usage() when using regrtest switches which are not compatible. ................ r78733 | florent.xicluna | 2010-03-06 18:34:48 +0100 (sam, 06 mar 2010) | 9 lines Merged revisions 78732 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78732 | florent.xicluna | 2010-03-06 18:24:36 +0100 (sam, 06 mar 2010) | 2 lines Do not print the header lines when running a single test. ........ ................ r78792 | florent.xicluna | 2010-03-08 13:24:53 +0100 (lun, 08 mar 2010) | 13 lines Merged revisions 78734-78735 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78734 | florent.xicluna | 2010-03-06 19:07:18 +0100 (sam, 06 mar 2010) | 2 lines Create test_genericpath.CommonTest and reuse it to test other path modules. ........ r78735 | florent.xicluna | 2010-03-06 19:52:52 +0100 (sam, 06 mar 2010) | 2 lines Minor tweaking of previous r78734, and add a NEWS entry. ........ ................ r78795 | florent.xicluna | 2010-03-08 13:42:20 +0100 (lun, 08 mar 2010) | 2 lines Merge other tests from test_*path.py into test_genericpath.CommonTest, and do some cleanup. ................ r78796 | florent.xicluna | 2010-03-08 13:47:44 +0100 (lun, 08 mar 2010) | 2 lines Fix string-> bytes conversion on backport from 2.x. ................ r78797 | florent.xicluna | 2010-03-08 14:27:26 +0100 (lun, 08 mar 2010) | 30 lines Merged revisions 78736,78759,78761,78767,78788-78789 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78736 | florent.xicluna | 2010-03-06 20:43:41 +0100 (sam, 06 mar 2010) | 2 lines Skip test_send_signal, test_kill, test_terminate on win32 platforms, for 2.7a4 release. ........ r78759 | florent.xicluna | 2010-03-07 13:21:36 +0100 (dim, 07 mar 2010) | 2 lines #2777: Enable test_send_signal, test_terminate and test_kill on win32 platforms. ........ r78761 | florent.xicluna | 2010-03-07 16:27:39 +0100 (dim, 07 mar 2010) | 4 lines Do not fail if returncode is 0 on send_signal/kill/terminate, for win32 platforms. Do not hide the KeyboardInterrupt on POSIX platforms. ........ r78767 | florent.xicluna | 2010-03-07 18:12:23 +0100 (dim, 07 mar 2010) | 2 lines #2777: Try hard to make Win7 buildbot happy... ........ r78788 | florent.xicluna | 2010-03-08 11:58:12 +0100 (lun, 08 mar 2010) | 2 lines Fix syntax: "rc != None" -> "rc is not None" ........ r78789 | florent.xicluna | 2010-03-08 11:59:33 +0100 (lun, 08 mar 2010) | 2 lines Replace the stderr logging with assertNotEqual(returncode, 0). ........ ................ r78801 | florent.xicluna | 2010-03-08 16:34:35 +0100 (lun, 08 mar 2010) | 11 lines Backport the tests only. Merged revisions 78800 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78800 | florent.xicluna | 2010-03-08 16:20:28 +0100 (lun, 08 mar 2010) | 2 lines #7624: Fix isinstance(foo(), collections.Callable) for old-style classes. ........ ................ r78829 | florent.xicluna | 2010-03-11 01:05:17 +0100 (jeu, 11 mar 2010) | 9 lines Merged revisions 78828 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78828 | florent.xicluna | 2010-03-11 00:58:42 +0100 (jeu, 11 mar 2010) | 2 lines Issue #7880: Fix sysconfig when the python executable is a symbolic link. ........ ................ r78831 | florent.xicluna | 2010-03-11 02:00:26 +0100 (jeu, 11 mar 2010) | 10 lines Merged revisions 78830 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78830 | florent.xicluna | 2010-03-11 01:56:59 +0100 (jeu, 11 mar 2010) | 3 lines Fix the test_subprocess failure when sys.executable is meaningless: '' or a directory. It does not fix #7774. ........ ................ r78834 | florent.xicluna | 2010-03-11 02:53:10 +0100 (jeu, 11 mar 2010) | 9 lines Merged revisions 78833 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78833 | florent.xicluna | 2010-03-11 02:50:48 +0100 (jeu, 11 mar 2010) | 2 lines Revert r78830: realpath() should really be applied to sys.executable. ........ ................ r78929 | florent.xicluna | 2010-03-13 16:26:44 +0100 (sam, 13 mar 2010) | 24 lines Only the parts which are relevant for 3.x branch. Merged revisions 78757-78758,78769,78815 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78757 | florent.xicluna | 2010-03-07 13:14:25 +0100 (dim, 07 mar 2010) | 2 lines Fix some py3k warnings in the standard library. ........ r78758 | florent.xicluna | 2010-03-07 13:18:33 +0100 (dim, 07 mar 2010) | 4 lines Issue #7849: Now the utility ``check_warnings`` verifies if the warnings are effectively raised. A new utility ``check_py3k_warnings`` deals with py3k warnings. ........ r78769 | florent.xicluna | 2010-03-07 20:14:12 +0100 (dim, 07 mar 2010) | 2 lines Refresh the documentation for the test.test_support module. ........ r78815 | florent.xicluna | 2010-03-09 20:57:01 +0100 (mar, 09 mar 2010) | 2 lines #7772: Fix test_py3kwarn. Now the test suite could pass with "-3" flag. ........ ................ r78942 | florent.xicluna | 2010-03-14 00:24:31 +0100 (dim, 14 mar 2010) | 30 lines Merged revisions 78838-78839,78917,78919,78934,78937 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78838 | florent.xicluna | 2010-03-11 15:36:19 +0100 (jeu, 11 mar 2010) | 2 lines Issue #6472: The xml.etree package is updated to ElementTree 1.3. The cElementTree module is updated too. ........ r78839 | florent.xicluna | 2010-03-11 16:55:11 +0100 (jeu, 11 mar 2010) | 2 lines Fix repr of tree Element on windows. ........ r78917 | florent.xicluna | 2010-03-13 12:18:49 +0100 (sam, 13 mar 2010) | 2 lines Move the xml test data to their own directory. ........ r78919 | florent.xicluna | 2010-03-13 13:41:48 +0100 (sam, 13 mar 2010) | 2 lines Do not chdir when running test_xml_etree, and enhance the findfile helper. ........ r78934 | florent.xicluna | 2010-03-13 18:56:19 +0100 (sam, 13 mar 2010) | 2 lines Update some parts of the xml.etree documentation. ........ r78937 | florent.xicluna | 2010-03-13 21:30:15 +0100 (sam, 13 mar 2010) | 3 lines Add the keyword argument "method=None" to the .write() method and the tostring/tostringlist functions. Update the function, class and method signatures, according to the new convention. ........ ................ r78945 | florent.xicluna | 2010-03-14 02:28:07 +0100 (dim, 14 mar 2010) | 9 lines Merged revisions 78944 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78944 | florent.xicluna | 2010-03-14 02:22:09 +0100 (dim, 14 mar 2010) | 2 lines Minor documentation updates for xml.etree. ........ ................ r78961 | florent.xicluna | 2010-03-14 13:31:06 +0100 (dim, 14 mar 2010) | 2 lines Fix an oversight in r78946 which causes failure in the subprocess module on Windows. ................ r79033 | florent.xicluna | 2010-03-17 21:29:51 +0100 (mer, 17 mar 2010) | 17 lines Merged revisions 79030-79032 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79030 | florent.xicluna | 2010-03-17 20:05:04 +0100 (mer, 17 mar 2010) | 2 lines Cleanup in test_import and test_coding. ........ r79031 | florent.xicluna | 2010-03-17 20:15:56 +0100 (mer, 17 mar 2010) | 2 lines Cleanup some test cases using check_warnings and check_py3k_warnings. ........ r79032 | florent.xicluna | 2010-03-17 21:05:11 +0100 (mer, 17 mar 2010) | 2 lines Fix and check cgi module deprecation warnings. Revert an unwanted rename in test_import. ........ ................ r79050 | florent.xicluna | 2010-03-18 21:00:57 +0100 (jeu, 18 mar 2010) | 9 lines Merged revisions 79049 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79049 | florent.xicluna | 2010-03-18 20:51:47 +0100 (jeu, 18 mar 2010) | 2 lines #8155: Preserve backward compatibility for test_support.check_warnings(). Add regression tests. ........ ................ r79062 | florent.xicluna | 2010-03-18 23:11:01 +0100 (jeu, 18 mar 2010) | 9 lines Merged revisions 79059 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79059 | florent.xicluna | 2010-03-18 22:50:06 +0100 (jeu, 18 mar 2010) | 2 lines Issue #8024: Update the Unicode database to 5.2 ........ ................ r79065 | florent.xicluna | 2010-03-18 23:19:01 +0100 (jeu, 18 mar 2010) | 2 lines Missing update from previous changeset r79062. ................ r79083 | florent.xicluna | 2010-03-19 01:03:01 +0100 (ven, 19 mar 2010) | 2 lines Fix bad unicodedata checksum merge from trunk in r79062 ................ r79088 | florent.xicluna | 2010-03-19 02:17:46 +0100 (ven, 19 mar 2010) | 2 lines Revert Unicode UCD 5.2 upgrade in 3.x. It broke repr() for unicode objects, and gave failures in test_bigmem. Revert 79062, 79065 and 79083. ................ r79093 | florent.xicluna | 2010-03-19 14:37:08 +0100 (ven, 19 mar 2010) | 11 lines Fixed a failure in test_bigmem. Merged revision 79059 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79059 | florent.xicluna | 2010-03-18 22:50:06 +0100 (jeu, 18 mar 2010) | 2 lines Issue #8024: Update the Unicode database to 5.2 ........ ................ r79094 | florent.xicluna | 2010-03-19 15:25:03 +0100 (ven, 19 mar 2010) | 14 lines Merged revisions 78982,78986 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r78982 | florent.xicluna | 2010-03-15 15:00:58 +0100 (lun, 15 mar 2010) | 2 lines Remove py3k deprecation warnings from these Unicode tools. ........ r78986 | florent.xicluna | 2010-03-15 19:08:58 +0100 (lun, 15 mar 2010) | 3 lines Issue #7783 and #7787: open_urlresource invalidates the outdated files from the local cache. Use this feature to fix test_normalization. ........ ................ r79102 | florent.xicluna | 2010-03-19 20:00:44 +0100 (ven, 19 mar 2010) | 9 lines Merged revisions 79100 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79100 | florent.xicluna | 2010-03-19 19:34:55 +0100 (ven, 19 mar 2010) | 2 lines Various tests cleanup: check_warnings/check_py3k_warnings, unittest.assert* and setUp/tearDown. ........ ................ r79128 | florent.xicluna | 2010-03-20 01:21:04 +0100 (sam, 20 mar 2010) | 9 lines Merged revisions 79127 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79127 | florent.xicluna | 2010-03-20 01:17:46 +0100 (sam, 20 mar 2010) | 2 lines #8178 Cleanup the threads after test_thread.TestForkInThread. ........ ................ r79145 | florent.xicluna | 2010-03-20 21:31:34 +0100 (sam, 20 mar 2010) | 2 lines Typo ................ r79209 | florent.xicluna | 2010-03-21 19:49:50 +0100 (dim, 21 mar 2010) | 9 lines Merged revisions 79207 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79207 | florent.xicluna | 2010-03-21 19:00:38 +0100 (dim, 21 mar 2010) | 2 lines #8180: Fix test_pep277 on OS X and add more tests for special Unicode normalization cases. ........ ................ r79473 | florent.xicluna | 2010-03-27 23:47:23 +0100 (sam, 27 mar 2010) | 17 lines Merged revisions 79344,79346,79350 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79344 | florent.xicluna | 2010-03-23 15:36:45 +0100 (mar, 23 mar 2010) | 2 lines Silence test_subprocess. ........ r79346 | florent.xicluna | 2010-03-23 16:05:30 +0100 (mar, 23 mar 2010) | 2 lines The standard error should be empty when the signal is killed, except on SIGINT. ........ r79350 | florent.xicluna | 2010-03-23 20:19:16 +0100 (mar, 23 mar 2010) | 2 lines The SIGINT signal may happen earlier, during site.py initialization. ........ ................ Modified: python/branches/release31-maint/ (props changed)

1 0

r79476 - in python/branches/release26-maint: Lib/lib-tk/turtle.py Lib/macpath.py Lib/test/regrtest.py Lib/test/test_warnings.py Misc/NEWS
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 11:37:55 2010 New Revision: 79476 Log: Merged revisions 79195,79425,79427,79450 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79195 | florent.xicluna | 2010-03-21 13:27:20 +0100 (dim, 21 mar 2010) | 2 lines Issue #8179: Fix macpath.realpath() on a non-existing path. ........ r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines Syntax cleanup `== None` -> `is None` ........ r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest" ........ r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines Ensure that the failed or unexpected tests are sorted before printing. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/lib-tk/turtle.py python/branches/release26-maint/Lib/macpath.py python/branches/release26-maint/Lib/test/regrtest.py python/branches/release26-maint/Lib/test/test_warnings.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/lib-tk/turtle.py ============================================================================== --- python/branches/release26-maint/Lib/lib-tk/turtle.py (original) +++ python/branches/release26-maint/Lib/lib-tk/turtle.py Sun Mar 28 11:37:55 2010 @@ -783,7 +783,7 @@ # needs amendment if not isinstance(self.cv, ScrolledCanvas): return self.canvwidth, self.canvheight - if canvwidth is None and canvheight is None and bg is None: + if canvwidth is canvheight is bg is None: return self.cv.canvwidth, self.cv.canvheight if canvwidth is not None: self.canvwidth = canvwidth @@ -999,7 +999,7 @@ >>> mode() 'logo' """ - if mode == None: + if mode is None: return self._mode mode = mode.lower() if mode not in ["standard", "logo", "world"]: @@ -1339,7 +1339,7 @@ ### repeatedly pressing the up-arrow key, ### consequently drawing a hexagon """ - if fun == None: + if fun is None: if key in self._keys: self._keys.remove(key) elif key not in self._keys: @@ -1460,7 +1460,7 @@ def _setmode(self, mode=None): """Set turtle-mode to 'standard', 'world' or 'logo'. """ - if mode == None: + if mode is None: return self._mode if mode not in ["standard", "logo", "world"]: return @@ -2704,7 +2704,7 @@ >>> turtle.shapesize(5, 5, 12) >>> turtle.shapesize(outline=8) """ - if stretch_wid is None and stretch_len is None and outline == None: + if stretch_wid is stretch_len is outline is None: stretch_wid, stretch_len = self._stretchfactor return stretch_wid, stretch_len, self._outlinewidth if stretch_wid is not None: Modified: python/branches/release26-maint/Lib/macpath.py ============================================================================== --- python/branches/release26-maint/Lib/macpath.py (original) +++ python/branches/release26-maint/Lib/macpath.py Sun Mar 28 11:37:55 2010 @@ -206,7 +206,10 @@ path = components[0] + ':' for c in components[1:]: path = join(path, c) - path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname() + try: + path = Carbon.File.FSResolveAliasFile(path, 1)[0].as_pathname() + except Carbon.File.Error: + pass return path supports_unicode_filenames = False Modified: python/branches/release26-maint/Lib/test/regrtest.py ============================================================================== --- python/branches/release26-maint/Lib/test/regrtest.py (original) +++ python/branches/release26-maint/Lib/test/regrtest.py Sun Mar 28 11:37:55 2010 @@ -399,11 +399,6 @@ if module not in save_modules and module.startswith("test."): test_support.unload(module) - # The lists won't be sorted if running with -r - good.sort() - bad.sort() - skipped.sort() - if good and not quiet: if not bad and not skipped and len(good) > 1: print "All", @@ -757,7 +752,8 @@ from textwrap import fill blanks = ' ' * indent - print fill(' '.join(map(str, x)), width, + # Print the sorted list: 'x' may be a '--random' list or a set() + print fill(' '.join(str(elt) for elt in sorted(x)), width, initial_indent=blanks, subsequent_indent=blanks) # Map sys.platform to a string containing the basenames of tests Modified: python/branches/release26-maint/Lib/test/test_warnings.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_warnings.py (original) +++ python/branches/release26-maint/Lib/test/test_warnings.py Sun Mar 28 11:37:55 2010 @@ -37,11 +37,15 @@ except NameError: pass original_warnings = warning_tests.warnings + original_filters = module.filters try: + module.filters = original_filters[:] + module.simplefilter("once") warning_tests.warnings = module yield finally: warning_tests.warnings = original_warnings + module.filters = original_filters class BaseTest(unittest.TestCase): @@ -204,6 +208,7 @@ def test_message(self): with original_warnings.catch_warnings(record=True, module=self.module) as w: + self.module.simplefilter("once") for i in range(4): text = 'multi %d' %i # Different text on each call. self.module.warn(text) Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sun Mar 28 11:37:55 2010 @@ -23,6 +23,8 @@ Library ------- +- Issue #8179: Fix macpath.realpath() on a non-existing path. + - Issue #7667: Fix doctest failures with non-ASCII paths. - Issue #7624: Fix isinstance(foo(), collections.Callable) for old-style

1 0

r79475 - python/branches/release26-maint
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 11:35:22 2010 New Revision: 79475 Log: Blocked revisions 79207,79288,79295-79296,79310,79334,79344,79346,79350,79378,79382,79426 via svnmerge ........ r79207 | florent.xicluna | 2010-03-21 19:00:38 +0100 (dim, 21 mar 2010) | 2 lines #8180: Fix test_pep277 on OS X and add more tests for special Unicode normalization cases. ........ r79288 | florent.xicluna | 2010-03-22 16:02:46 +0100 (lun, 22 mar 2010) | 2 lines Get rid of buffer() in test_ctypes: backport the 3.x tests. ........ r79295 | florent.xicluna | 2010-03-22 17:07:38 +0100 (lun, 22 mar 2010) | 3 lines Issue #7703: ctypes supports both buffer() and memoryview(). The former is deprecated. Complement of r79288. ........ r79296 | florent.xicluna | 2010-03-22 17:36:51 +0100 (lun, 22 mar 2010) | 3 lines Preserve backward compatibility of the ctypes module. "This file should be kept compatible with Python 2.3, see PEP 291." ........ r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only). ........ r79334 | florent.xicluna | 2010-03-23 12:07:54 +0100 (mar, 23 mar 2010) | 2 lines Skip test_format_deprecation if _ctypes is not available. Add a filter to the warning check. ........ r79344 | florent.xicluna | 2010-03-23 15:36:45 +0100 (mar, 23 mar 2010) | 2 lines Silence test_subprocess. ........ r79346 | florent.xicluna | 2010-03-23 16:05:30 +0100 (mar, 23 mar 2010) | 2 lines The standard error should be empty when the signal is killed, except on SIGINT. ........ r79350 | florent.xicluna | 2010-03-23 20:19:16 +0100 (mar, 23 mar 2010) | 2 lines The SIGINT signal may happen earlier, during site.py initialization. ........ r79378 | florent.xicluna | 2010-03-24 18:32:58 +0100 (mer, 24 mar 2010) | 3 lines Skip test_ascii_formatd if _ctypes is not available (BSD, ...). Previous change was incomplete (r79334). ........ r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available. ........ r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines #8207: Fix test_pep277 on OS X ........ Modified: python/branches/release26-maint/ (props changed)

1 0

r79474 - in python/branches/py3k: Lib/idlelib/PyShell.py Lib/site.py Lib/test/regrtest.py Lib/test/test_httpservers.py Lib/test/test_multiprocessing.py Lib/test/test_pep277.py Lib/test/test_warnings.py Lib/turtle.py Lib/unittest/test/test_assertions.py Lib/unittest/test/test_case.py Lib/unittest/test/test_result.py Misc/NEWS
by florent.xicluna 28 Mar '10

28 Mar '10

Author: florent.xicluna Date: Sun Mar 28 01:25:02 2010 New Revision: 79474 Log: Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines #7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes. ........ r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only). ........ r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available. ........ r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines Syntax cleanup `== None` -> `is None` ........ r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines #8207: Fix test_pep277 on OS X ........ r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest" ........ r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines Ensure that the failed or unexpected tests are sorted before printing. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/idlelib/PyShell.py python/branches/py3k/Lib/site.py python/branches/py3k/Lib/test/regrtest.py python/branches/py3k/Lib/test/test_httpservers.py python/branches/py3k/Lib/test/test_multiprocessing.py python/branches/py3k/Lib/test/test_pep277.py python/branches/py3k/Lib/test/test_warnings.py python/branches/py3k/Lib/turtle.py python/branches/py3k/Lib/unittest/test/test_assertions.py python/branches/py3k/Lib/unittest/test/test_case.py python/branches/py3k/Lib/unittest/test/test_result.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Lib/idlelib/PyShell.py ============================================================================== --- python/branches/py3k/Lib/idlelib/PyShell.py (original) +++ python/branches/py3k/Lib/idlelib/PyShell.py Sun Mar 28 01:25:02 2010 @@ -347,7 +347,7 @@ rpcpid = None def spawn_subprocess(self): - if self.subprocess_arglist == None: + if self.subprocess_arglist is None: self.subprocess_arglist = self.build_subprocess_arglist() args = self.subprocess_arglist self.rpcpid = os.spawnv(os.P_NOWAIT, sys.executable, args) Modified: python/branches/py3k/Lib/site.py ============================================================================== --- python/branches/py3k/Lib/site.py (original) +++ python/branches/py3k/Lib/site.py Sun Mar 28 01:25:02 2010 @@ -112,7 +112,7 @@ s = "build/lib.%s-%.3s" % (get_platform(), sys.version) if hasattr(sys, 'gettotalrefcount'): s += '-pydebug' - s = os.path.join(os.path.dirname(sys.path[-1]), s) + s = os.path.join(os.path.dirname(sys.path.pop()), s) sys.path.append(s) Modified: python/branches/py3k/Lib/test/regrtest.py ============================================================================== --- python/branches/py3k/Lib/test/regrtest.py (original) +++ python/branches/py3k/Lib/test/regrtest.py Sun Mar 28 01:25:02 2010 @@ -612,12 +612,6 @@ if module not in save_modules and module.startswith("test."): support.unload(module) - # The lists won't be sorted if running with -r - good.sort() - bad.sort() - skipped.sort() - environment_changed.sort() - if good and not quiet: if not bad and not skipped and len(good) > 1: print("All", end=' ') @@ -1128,7 +1122,8 @@ from textwrap import fill blanks = ' ' * indent - print(fill(' '.join(str(elt) for elt in x), width, + # Print the sorted list: 'x' may be a '--random' list or a set() + print(fill(' '.join(str(elt) for elt in sorted(x)), width, initial_indent=blanks, subsequent_indent=blanks)) # Map sys.platform to a string containing the basenames of tests Modified: python/branches/py3k/Lib/test/test_httpservers.py ============================================================================== --- python/branches/py3k/Lib/test/test_httpservers.py (original) +++ python/branches/py3k/Lib/test/test_httpservers.py Sun Mar 28 01:25:02 2010 @@ -298,14 +298,22 @@ self.cgi_dir = os.path.join(self.parent_dir, 'cgi-bin') os.mkdir(self.cgi_dir) + # The shebang line should be pure ASCII: use symlink if possible. + # See issue #7668. + if hasattr(os, 'symlink'): + self.pythonexe = os.path.join(self.parent_dir, 'python') + os.symlink(sys.executable, self.pythonexe) + else: + self.pythonexe = sys.executable + self.file1_path = os.path.join(self.cgi_dir, 'file1.py') with open(self.file1_path, 'w') as file1: - file1.write(cgi_file1 % sys.executable) + file1.write(cgi_file1 % self.pythonexe) os.chmod(self.file1_path, 0o777) self.file2_path = os.path.join(self.cgi_dir, 'file2.py') with open(self.file2_path, 'w') as file2: - file2.write(cgi_file2 % sys.executable) + file2.write(cgi_file2 % self.pythonexe) os.chmod(self.file2_path, 0o777) self.cwd = os.getcwd() @@ -314,6 +322,8 @@ def tearDown(self): try: os.chdir(self.cwd) + if self.pythonexe != sys.executable: + os.remove(self.pythonexe) os.remove(self.file1_path) os.remove(self.file2_path) os.rmdir(self.cgi_dir) Modified: python/branches/py3k/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/py3k/Lib/test/test_multiprocessing.py (original) +++ python/branches/py3k/Lib/test/test_multiprocessing.py Sun Mar 28 01:25:02 2010 @@ -64,6 +64,16 @@ WIN32 = (sys.platform == "win32") # +# Some tests require ctypes +# + +try: + from ctypes import Structure, Value, copy, c_int, c_double +except ImportError: + Structure = object + c_int = c_double = None + +# # Creates a wrapper for a function which records the time it takes to finish # @@ -506,7 +516,7 @@ queue = self.JoinableQueue() if sys.version_info < (2, 5) and not hasattr(queue, 'task_done'): - return + self.skipTest("requires 'queue.task_done()' method") workers = [self.Process(target=self._test_task_done, args=(queue,)) for i in range(4)] @@ -783,6 +793,8 @@ class _TestValue(BaseTestCase): + ALLOWED_TYPES = ('processes',) + codes_values = [ ('i', 4343, 24234), ('d', 3.625, -4.25), @@ -795,10 +807,8 @@ sv.value = cv[2] + @unittest.skipIf(c_int is None, "requires _ctypes") def test_value(self, raw=False): - if self.TYPE != 'processes': - return - if raw: values = [self.RawValue(code, value) for code, value, _ in self.codes_values] @@ -816,13 +826,12 @@ for sv, cv in zip(values, self.codes_values): self.assertEqual(sv.value, cv[2]) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_rawvalue(self): self.test_value(raw=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_getobj_getlock(self): - if self.TYPE != 'processes': - return - val1 = self.Value('i', 5) lock1 = val1.get_lock() obj1 = val1.get_obj() @@ -850,14 +859,14 @@ class _TestArray(BaseTestCase): + ALLOWED_TYPES = ('processes',) + def f(self, seq): for i in range(1, len(seq)): seq[i] += seq[i-1] + @unittest.skipIf(c_int is None, "requires _ctypes") def test_array(self, raw=False): - if self.TYPE != 'processes': - return - seq = [680, 626, 934, 821, 150, 233, 548, 982, 714, 831] if raw: arr = self.RawArray('i', seq) @@ -880,13 +889,12 @@ self.assertEqual(list(arr[:]), seq) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_rawarray(self): self.test_array(raw=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_getobj_getlock_obj(self): - if self.TYPE != 'processes': - return - arr1 = self.Array('i', list(range(10))) lock1 = arr1.get_lock() obj1 = arr1.get_obj() @@ -1570,12 +1578,6 @@ # # -try: - from ctypes import Structure, Value, copy, c_int, c_double -except ImportError: - Structure = object - c_int = c_double = None - class _Foo(Structure): _fields_ = [ ('x', c_int), @@ -1595,10 +1597,8 @@ for i in range(len(arr)): arr[i] *= 2 + @unittest.skipIf(c_int is None, "requires _ctypes") def test_sharedctypes(self, lock=False): - if c_int is None: - return - x = Value('i', 7, lock=lock) y = Value(c_double, 1.0/3.0, lock=lock) foo = Value(_Foo, 3, 2, lock=lock) @@ -1621,10 +1621,8 @@ def test_synchronize(self): self.test_sharedctypes(lock=True) + @unittest.skipIf(c_int is None, "requires _ctypes") def test_copy(self): - if c_int is None: - return - foo = _Foo(2, 5.0) bar = copy(foo) foo.x = 0 @@ -1696,13 +1694,17 @@ ALLOWED_TYPES = ('processes',) def test_import(self): - modules = ( + modules = [ 'multiprocessing', 'multiprocessing.connection', 'multiprocessing.heap', 'multiprocessing.managers', 'multiprocessing.pool', 'multiprocessing.process', - 'multiprocessing.reduction', 'multiprocessing.sharedctypes', + 'multiprocessing.reduction', 'multiprocessing.synchronize', 'multiprocessing.util' - ) + ] + + if c_int is not None: + # This module requires _ctypes + modules.append('multiprocessing.sharedctypes') for name in modules: __import__(name) @@ -1782,12 +1784,12 @@ class TestInvalidHandle(unittest.TestCase): + @unittest.skipIf(WIN32, "skipped on Windows") def test_invalid_handles(self): - if WIN32: - return conn = _multiprocessing.Connection(44977608) self.assertRaises(IOError, conn.poll) self.assertRaises(IOError, _multiprocessing.Connection, -1) + # # Functions used to create test cases from the base ones in this module # @@ -1804,7 +1806,7 @@ def create_test_cases(Mixin, type): result = {} glob = globals() - Type = type[0].upper() + type[1:] + Type = type.capitalize() for name in list(glob.keys()): if name.startswith('_Test'): Modified: python/branches/py3k/Lib/test/test_pep277.py ============================================================================== --- python/branches/py3k/Lib/test/test_pep277.py (original) +++ python/branches/py3k/Lib/test/test_pep277.py Sun Mar 28 01:25:02 2010 @@ -15,11 +15,6 @@ '\u66e8\u66e9\u66eb', '\u66e8\u05e9\u3093\u0434\u0393\xdf', # Specific code points: fn, NFC(fn) and NFKC(fn) all differents - '\u2000\u2000\u2000A', - '\u2001\u2001\u2001A', - '\u2003\u2003\u2003A', # == NFC('\u2001\u2001\u2001A') - '\u0020\u0020\u0020A', # '\u0020' == ' ' == NFKC('\u2000') - # '\u0020' == NFKC('\u2001') == NFKC('\u2003') '\u1fee\u1ffd', # Specific code points: NFC(fn), NFD(fn), NFKC(fn) and NFKD(fn) all differents '\u0385\u03d3\u03d4', @@ -28,6 +23,22 @@ '\u1e9b\u1fc1\u1fcd\u1fce\u1fcf\u1fdd\u1fde\u1fdf\u1fed', ] +# Mac OS X decomposes Unicode names, using Normal Form D. +# http://developer.apple.com/mac/library/qa/qa2001/qa1173.html +# "However, most volume formats do not follow the exact specification for +# these normal forms. For example, HFS Plus uses a variant of Normal Form D +# in which U+2000 through U+2FFF, U+F900 through U+FAFF, and U+2F800 through +# U+2FAFF are not decomposed." +if sys.platform != 'darwin': + filenames.extend([ + # Specific code points: fn, NFC(fn) and NFKC(fn) all differents + '\u1fee\u1ffd\ufad1', + '\u2000\u2000\u2000A', + '\u2001\u2001\u2001A', + '\u2003\u2003\u2003A', # == NFC('\u2001\u2001\u2001A') + '\u0020\u0020\u0020A', # '\u0020' == ' ' == NFKC('\u2000') == + # NFKC('\u2001') == NFKC('\u2003') +]) # Destroy directory dirname and all files under it, to one level. def deltree(dirname): @@ -114,8 +125,7 @@ files = set(normalize('NFD', file) for file in files) for name in others: if sys.platform == 'darwin' and normalize('NFD', name) in files: - # Mac OS X decomposes Unicode names, using Normal Form D. - # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html + # Mac OS X decomposes Unicode names. See comment above. os.stat(name) continue self._apply_failure(open, name, IOError) @@ -131,8 +141,7 @@ f1 = os.listdir(support.TESTFN.encode(sys.getfilesystemencoding())) f2 = os.listdir(support.TESTFN) if sys.platform == 'darwin': - # Mac OS X returns canonically decomposed Unicode (Normal Form D) - # http://developer.apple.com/mac/library/qa/qa2001/qa1173.html + # Mac OS X decomposes Unicode names. See comment above. sf0 = set(normalize('NFD', f) for f in self.files) f2 = [normalize('NFD', f) for f in f2] sf2 = set(os.path.join(support.TESTFN, f) for f in f2) Modified: python/branches/py3k/Lib/test/test_warnings.py ============================================================================== --- python/branches/py3k/Lib/test/test_warnings.py (original) +++ python/branches/py3k/Lib/test/test_warnings.py Sun Mar 28 01:25:02 2010 @@ -27,11 +27,15 @@ except NameError: pass original_warnings = warning_tests.warnings + original_filters = module.filters try: + module.filters = original_filters[:] + module.simplefilter("once") warning_tests.warnings = module yield finally: warning_tests.warnings = original_warnings + module.filters = original_filters class BaseTest(unittest.TestCase): @@ -194,6 +198,7 @@ def test_message(self): with original_warnings.catch_warnings(record=True, module=self.module) as w: + self.module.simplefilter("once") for i in range(4): text = 'multi %d' %i # Different text on each call. self.module.warn(text) @@ -206,6 +211,7 @@ for ob in (Warning, None, 42): with original_warnings.catch_warnings(record=True, module=self.module) as w: + self.module.simplefilter("once") self.module.warn(ob) # Don't directly compare objects since # ``Warning() != Warning()``. Modified: python/branches/py3k/Lib/turtle.py ============================================================================== --- python/branches/py3k/Lib/turtle.py (original) +++ python/branches/py3k/Lib/turtle.py Sun Mar 28 01:25:02 2010 @@ -778,7 +778,7 @@ # needs amendment if not isinstance(self.cv, ScrolledCanvas): return self.canvwidth, self.canvheight - if canvwidth is None and canvheight is None and bg is None: + if canvwidth is canvheight is bg is None: return self.cv.canvwidth, self.cv.canvheight if canvwidth is not None: self.canvwidth = canvwidth @@ -1046,7 +1046,7 @@ >>> mode() 'logo' """ - if mode == None: + if mode is None: return self._mode mode = mode.lower() if mode not in ["standard", "logo", "world"]: @@ -1385,7 +1385,7 @@ ### repeatedly pressing the up-arrow key, ### consequently drawing a hexagon """ - if fun == None: + if fun is None: if key in self._keys: self._keys.remove(key) elif key not in self._keys: @@ -1418,7 +1418,7 @@ ### or by keeping pressed the up-arrow key. ### consequently drawing a hexagon. """ - if fun == None: + if fun is None: if key in self._keys: self._keys.remove(key) elif key is not None and key not in self._keys: @@ -1540,7 +1540,7 @@ def _setmode(self, mode=None): """Set turtle-mode to 'standard', 'world' or 'logo'. """ - if mode == None: + if mode is None: return self._mode if mode not in ["standard", "logo", "world"]: return @@ -2795,7 +2795,7 @@ >>> turtle.shapesize(5, 5, 12) >>> turtle.shapesize(outline=8) """ - if stretch_wid is stretch_len is outline == None: + if stretch_wid is stretch_len is outline is None: stretch_wid, stretch_len = self._stretchfactor return stretch_wid, stretch_len, self._outlinewidth if stretch_wid == 0 or stretch_len == 0: Modified: python/branches/py3k/Lib/unittest/test/test_assertions.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_assertions.py (original) +++ python/branches/py3k/Lib/unittest/test/test_assertions.py Sun Mar 28 01:25:02 2010 @@ -1,7 +1,5 @@ import unittest -import warnings - class Test_Assertions(unittest.TestCase): def test_AlmostEqual(self): @@ -108,11 +106,9 @@ self.testableTrue._formatMessage(object(), 'foo') def test_formatMessage_unicode_error(self): - with warnings.catch_warnings(record=True): - # This causes a UnicodeWarning due to its craziness - one = ''.join(chr(i) for i in range(255)) - # this used to cause a UnicodeDecodeError constructing msg - self.testableTrue._formatMessage(one, '\uFFFD') + one = ''.join(chr(i) for i in range(255)) + # this used to cause a UnicodeDecodeError constructing msg + self.testableTrue._formatMessage(one, '\uFFFD') def assertMessages(self, methodName, args, errors): def getMethod(i): Modified: python/branches/py3k/Lib/unittest/test/test_case.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_case.py (original) +++ python/branches/py3k/Lib/unittest/test/test_case.py Sun Mar 28 01:25:02 2010 @@ -1,6 +1,5 @@ import re import sys -import warnings from copy import deepcopy from test import support @@ -496,12 +495,10 @@ with self.assertRaises(self.failureException): self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1}) - with warnings.catch_warnings(record=True): - # silence the UnicodeWarning - one = ''.join(chr(i) for i in range(255)) - # this used to cause a UnicodeDecodeError constructing the failure msg - with self.assertRaises(self.failureException): - self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'}) + one = ''.join(chr(i) for i in range(255)) + # this used to cause a UnicodeDecodeError constructing the failure msg + with self.assertRaises(self.failureException): + self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'}) def testAssertEqual(self): equal_pairs = [ @@ -615,9 +612,9 @@ # hashable types, but not orderable self.assertRaises(self.failureException, self.assertItemsEqual, [], [divmod, 'x', 1, 5j, 2j, frozenset()]) - # comparing dicts raises a py3k warning + # comparing dicts self.assertItemsEqual([{'a': 1}, {'b': 2}], [{'b': 2}, {'a': 1}]) - # comparing heterogenous non-hashable sequences raises a py3k warning + # comparing heterogenous non-hashable sequences self.assertItemsEqual([1, 'x', divmod, []], [divmod, [], 'x', 1]) self.assertRaises(self.failureException, self.assertItemsEqual, [], [divmod, [], 'x', 1, 5j, 2j, set()]) @@ -852,10 +849,9 @@ (self.assertSameElements, ([1, 1, 2, 3], [1, 2, 3])) ) for meth, args in old: - with warnings.catch_warnings(record=True) as w: + with support.check_warnings(('', DeprecationWarning)) as w: meth(*args) - self.assertEqual(len(w), 1) - self.assertIs(w[0].category, DeprecationWarning) + self.assertEqual(len(w.warnings), 1) def testDeepcopy(self): # Issue: 5660 Modified: python/branches/py3k/Lib/unittest/test/test_result.py ============================================================================== --- python/branches/py3k/Lib/unittest/test/test_result.py (original) +++ python/branches/py3k/Lib/unittest/test/test_result.py Sun Mar 28 01:25:02 2010 @@ -308,12 +308,11 @@ class Test_OldTestResult(unittest.TestCase): def assertOldResultWarning(self, test, failures): - with warnings.catch_warnings(record=True) as log: + with support.check_warnings(("TestResult has no add.+ method,", + RuntimeWarning)): result = OldResult() test.run(result) self.assertEqual(len(result.failures), failures) - warning, = log - self.assertIs(warning.category, RuntimeWarning) def testOldTestResult(self): class Test(unittest.TestCase): Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sun Mar 28 01:25:02 2010 @@ -302,6 +302,9 @@ some methods (such as oss_mixer_device.fileno()) were not available. Initial patch by Bertrand Janin. +- Issue #8205: Remove the "Modules" directory from sys.path when Python is + running from the build directory (POSIX only). + - Issue #7512: shutil.copystat() could raise an OSError when the filesystem didn't support chflags() (for example ZFS under FreeBSD). The error is now silenced. @@ -950,8 +953,8 @@ Tests ----- -- Issue #8180: Fix test_pep277 on OS X and add more tests for special Unicode - normalization cases. +- Issue #8180 and #8207: Fix test_pep277 on OS X and add more tests for special + Unicode normalization cases. - Issue #7783: test.support.open_urlresource invalidates the outdated files from the local cache.

1 0

Daily py3k reference leaks (r79469): sum=0
by solipsis＠pitrou.net 28 Mar '10

28 Mar '10

py3k results for svn r79469 (hg cset edc17c8e2f5b) -------------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/py3k/refleaks/reflogx2o5Uu', '-x', 'test_httpservers']

1 0

r79473 - in python/branches/py3k: Lib/test/test_subprocess.py
by florent.xicluna 27 Mar '10

27 Mar '10

Author: florent.xicluna Date: Sat Mar 27 23:47:23 2010 New Revision: 79473 Log: Merged revisions 79344,79346,79350 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79344 | florent.xicluna | 2010-03-23 15:36:45 +0100 (mar, 23 mar 2010) | 2 lines Silence test_subprocess. ........ r79346 | florent.xicluna | 2010-03-23 16:05:30 +0100 (mar, 23 mar 2010) | 2 lines The standard error should be empty when the signal is killed, except on SIGINT. ........ r79350 | florent.xicluna | 2010-03-23 20:19:16 +0100 (mar, 23 mar 2010) | 2 lines The SIGINT signal may happen earlier, during site.py initialization. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_subprocess.py Modified: python/branches/py3k/Lib/test/test_subprocess.py ============================================================================== --- python/branches/py3k/Lib/test/test_subprocess.py (original) +++ python/branches/py3k/Lib/test/test_subprocess.py Sat Mar 27 23:47:23 2010 @@ -37,7 +37,7 @@ return os.open(fname, os.O_RDWR|os.O_CREAT), fname -class ProcessTestCase(unittest.TestCase): +class BaseTestCase(unittest.TestCase): def setUp(self): # Try to minimize the number of children we have so this test # doesn't crash on some buildbots (Alphas in particular). @@ -56,6 +56,9 @@ actual = re.sub("\[\d+ refs\]\r?\n?$", "", stderr.decode()).encode() self.assertEqual(actual, expected, msg) + +class ProcessTestCase(BaseTestCase): + def test_call_seq(self): # call() function with sequence argument rc = subprocess.call([sys.executable, "-c", @@ -559,17 +562,7 @@ @unittest.skipIf(mswindows, "POSIX specific tests") -class POSIXProcessTestCase(unittest.TestCase): - def setUp(self): - # Try to minimize the number of children we have so this test - # doesn't crash on some buildbots (Alphas in particular). - support.reap_children() - - def tearDown(self): - for inst in subprocess._active: - inst.wait() - subprocess._cleanup() - self.assertFalse(subprocess._active, "subprocess._active not empty") +class POSIXProcessTestCase(BaseTestCase): def test_exceptions(self): nonexistent_dir = "/_this/pa.th/does/not/exist" @@ -752,7 +745,7 @@ # Do not inherit file handles from the parent. # It should fix failures on some platforms. p = subprocess.Popen([sys.executable, "-c", "input()"], close_fds=True, - stdin=subprocess.PIPE) + stdin=subprocess.PIPE, stderr=subprocess.PIPE) # Let the process initialize (Issue #3137) time.sleep(0.1) @@ -773,29 +766,25 @@ def test_send_signal(self): p = self._kill_process('send_signal', signal.SIGINT) + _, stderr = p.communicate() + self.assertIn(b'KeyboardInterrupt', stderr) self.assertNotEqual(p.wait(), 0) def test_kill(self): p = self._kill_process('kill') + _, stderr = p.communicate() + self.assertStderrEqual(stderr, b'') self.assertEqual(p.wait(), -signal.SIGKILL) def test_terminate(self): p = self._kill_process('terminate') + _, stderr = p.communicate() + self.assertStderrEqual(stderr, b'') self.assertEqual(p.wait(), -signal.SIGTERM) @unittest.skipUnless(mswindows, "Windows specific tests") -class Win32ProcessTestCase(unittest.TestCase): - def setUp(self): - # Try to minimize the number of children we have so this test - # doesn't crash on some buildbots (Alphas in particular). - support.reap_children() - - def tearDown(self): - for inst in subprocess._active: - inst.wait() - subprocess._cleanup() - self.assertFalse(subprocess._active, "subprocess._active not empty") +class Win32ProcessTestCase(BaseTestCase): def test_startupinfo(self): # startupinfo argument @@ -866,7 +855,7 @@ def _kill_process(self, method, *args): # Some win32 buildbot raises EOFError if stdin is inherited p = subprocess.Popen([sys.executable, "-c", "input()"], - stdin=subprocess.PIPE) + stdin=subprocess.PIPE, stderr=subprocess.PIPE) # Let the process initialize (Issue #3137) time.sleep(0.1) @@ -884,6 +873,8 @@ if count > 1: print("p.{}{} succeeded after " "{} attempts".format(method, args, count), file=sys.stderr) + _, stderr = p.communicate() + self.assertStderrEqual(stderr, b'') self.assertEqual(p.wait(), returncode) self.assertNotEqual(returncode, 0)

1 0

r79472 - python/branches/py3k
by florent.xicluna 27 Mar '10

27 Mar '10

Author: florent.xicluna Date: Sat Mar 27 23:18:04 2010 New Revision: 79472 Log: Blocked revisions 79288,79295-79296,79334,79378 via svnmerge ........ r79288 | florent.xicluna | 2010-03-22 16:02:46 +0100 (lun, 22 mar 2010) | 2 lines Get rid of buffer() in test_ctypes: backport the 3.x tests. ........ r79295 | florent.xicluna | 2010-03-22 17:07:38 +0100 (lun, 22 mar 2010) | 3 lines Issue #7703: ctypes supports both buffer() and memoryview(). The former is deprecated. Complement of r79288. ........ r79296 | florent.xicluna | 2010-03-22 17:36:51 +0100 (lun, 22 mar 2010) | 3 lines Preserve backward compatibility of the ctypes module. "This file should be kept compatible with Python 2.3, see PEP 291." ........ r79334 | florent.xicluna | 2010-03-23 12:07:54 +0100 (mar, 23 mar 2010) | 2 lines Skip test_format_deprecation if _ctypes is not available. Add a filter to the warning check. ........ r79378 | florent.xicluna | 2010-03-24 18:32:58 +0100 (mer, 24 mar 2010) | 3 lines Skip test_ascii_formatd if _ctypes is not available (BSD, ...). Previous change was incomplete (r79334). ........ Modified: python/branches/py3k/ (props changed)

1 0