Mailman 3 April 2010 - Python-checkins

r80673 - peps/trunk/pep-0291.txt
by jeffrey.yasskin 01 May '10

01 May '10

Author: jeffrey.yasskin Date: Sat May 1 01:29:59 2010 New Revision: 80673 Log: Mark 2to3 as compatible with python-2.5 per the discussion in issue 8566. Modified: peps/trunk/pep-0291.txt Modified: peps/trunk/pep-0291.txt ============================================================================== --- peps/trunk/pep-0291.txt (original) +++ peps/trunk/pep-0291.txt Sat May 1 01:29:59 2010 @@ -82,16 +82,19 @@ 2.4 with statement, conditional expressions, combined try/except/finally, relative imports, - yield expressions or generator.throw/send/close() + yield expressions or generator.throw/send/close(), + plus all features below - 2.5 ??? + 2.5 with statement without from __future__ import, + io module, str.format(), except as, + bytes, b'' literals, property.setter/deleter Backward Compatible Packages, Modules, and Tools Package/Module Maintainer(s) Python Version Notes -------------- ------------- -------------- ----- - 2to3 Benjamin Peterson 2.6 + 2to3 Benjamin Peterson 2.5 bsddb Greg Smith 2.1 Barry Warsaw compiler Jeremy Hylton 2.1

1 0

r80672 - in python/branches/release31-maint: Lib/test/test_multiprocessing.py Lib/test/test_smtplib.py Misc/NEWS
by antoine.pitrou 01 May '10

01 May '10

Author: antoine.pitrou Date: Sat May 1 01:23:38 2010 New Revision: 80672 Log: Merged revisions 80671 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r80671 | antoine.pitrou | 2010-05-01 01:20:15 +0200 (sam., 01 mai 2010) | 10 lines Merged revisions 80669 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80669 | antoine.pitrou | 2010-05-01 01:08:48 +0200 (sam., 01 mai 2010) | 4 lines Issue #8576: Remove use of find_unused_port() in test_smtplib and test_multiprocessing. Patch by Paul Moore. ........ ................ Modified: python/branches/release31-maint/ (props changed) python/branches/release31-maint/Lib/test/test_multiprocessing.py python/branches/release31-maint/Lib/test/test_smtplib.py python/branches/release31-maint/Misc/NEWS 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 Sat May 1 01:23:38 2010 @@ -1221,9 +1221,9 @@ def test_rapid_restart(self): authkey = os.urandom(32) - port = test.support.find_unused_port() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) + addr = manager.get_server().address manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey)) @@ -1233,7 +1233,7 @@ del queue manager.shutdown() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=addr, authkey=authkey, serializer=SERIALIZER) manager.start() manager.shutdown() Modified: python/branches/release31-maint/Lib/test/test_smtplib.py ============================================================================== --- python/branches/release31-maint/Lib/test/test_smtplib.py (original) +++ python/branches/release31-maint/Lib/test/test_smtplib.py Sat May 1 01:23:38 2010 @@ -152,8 +152,10 @@ self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = smtpd.DebuggingServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) threading.Thread(target=debugging_server, args=serv_args).start() @@ -379,8 +381,10 @@ def setUp(self): self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = SimSMTPServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) threading.Thread(target=debugging_server, args=serv_args).start() Modified: python/branches/release31-maint/Misc/NEWS ============================================================================== --- python/branches/release31-maint/Misc/NEWS (original) +++ python/branches/release31-maint/Misc/NEWS Sat May 1 01:23:38 2010 @@ -137,6 +137,9 @@ Tests ----- +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + - Issue #8531: Skip test_ascii_formatd if ctypes module is missing - Issue #3864: Skip three test_signal tests on freebsd6 because they fail

1 0

r80671 - in python/branches/py3k: Lib/test/test_multiprocessing.py Lib/test/test_smtplib.py Misc/NEWS
by antoine.pitrou 01 May '10

01 May '10

Author: antoine.pitrou Date: Sat May 1 01:20:15 2010 New Revision: 80671 Log: Merged revisions 80669 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80669 | antoine.pitrou | 2010-05-01 01:08:48 +0200 (sam., 01 mai 2010) | 4 lines Issue #8576: Remove use of find_unused_port() in test_smtplib and test_multiprocessing. Patch by Paul Moore. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_multiprocessing.py python/branches/py3k/Lib/test/test_smtplib.py python/branches/py3k/Misc/NEWS 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 Sat May 1 01:20:15 2010 @@ -1256,9 +1256,9 @@ def test_rapid_restart(self): authkey = os.urandom(32) - port = test.support.find_unused_port() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) + addr = manager.get_server().address manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey)) @@ -1268,7 +1268,7 @@ del queue manager.shutdown() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=addr, authkey=authkey, serializer=SERIALIZER) manager.start() manager.shutdown() Modified: python/branches/py3k/Lib/test/test_smtplib.py ============================================================================== --- python/branches/py3k/Lib/test/test_smtplib.py (original) +++ python/branches/py3k/Lib/test/test_smtplib.py Sat May 1 01:20:15 2010 @@ -163,8 +163,10 @@ self._threads = support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = smtpd.DebuggingServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() @@ -400,8 +402,10 @@ self._threads = support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = support.find_unused_port() - self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = SimSMTPServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Sat May 1 01:20:15 2010 @@ -1198,6 +1198,9 @@ Tests ----- +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + - Issue #7449: Fix many tests to support Python compiled without thread support. Patches written by Jerry Seutter.

1 0

r80670 - in python/branches/release26-maint: Lib/test/test_multiprocessing.py Lib/test/test_smtplib.py Misc/NEWS
by antoine.pitrou 01 May '10

01 May '10

Author: antoine.pitrou Date: Sat May 1 01:10:44 2010 New Revision: 80670 Log: Merged revisions 80669 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r80669 | antoine.pitrou | 2010-05-01 01:08:48 +0200 (sam., 01 mai 2010) | 4 lines Issue #8576: Remove use of find_unused_port() in test_smtplib and test_multiprocessing. Patch by Paul Moore. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_multiprocessing.py python/branches/release26-maint/Lib/test/test_smtplib.py python/branches/release26-maint/Misc/NEWS Modified: python/branches/release26-maint/Lib/test/test_multiprocessing.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_multiprocessing.py (original) +++ python/branches/release26-maint/Lib/test/test_multiprocessing.py Sat May 1 01:10:44 2010 @@ -1205,9 +1205,9 @@ def test_rapid_restart(self): authkey = os.urandom(32) - port = test_support.find_unused_port() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) + addr = manager.get_server().address manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey)) @@ -1217,7 +1217,7 @@ del queue manager.shutdown() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=addr, authkey=authkey, serializer=SERIALIZER) manager.start() manager.shutdown() Modified: python/branches/release26-maint/Lib/test/test_smtplib.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_smtplib.py (original) +++ python/branches/release26-maint/Lib/test/test_smtplib.py Sat May 1 01:10:44 2010 @@ -144,8 +144,10 @@ self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = test_support.find_unused_port() - self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = smtpd.DebuggingServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) threading.Thread(target=debugging_server, args=serv_args).start() @@ -371,8 +373,10 @@ def setUp(self): self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = test_support.find_unused_port() - self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = SimSMTPServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) threading.Thread(target=debugging_server, args=serv_args).start() Modified: python/branches/release26-maint/Misc/NEWS ============================================================================== --- python/branches/release26-maint/Misc/NEWS (original) +++ python/branches/release26-maint/Misc/NEWS Sat May 1 01:10:44 2010 @@ -140,6 +140,9 @@ Tests ----- +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + - Issue #7027: regrtest.py keeps a reference to the encodings.ascii module as a workaround to #7140 bug

1 0

r80669 - in python/trunk: Lib/test/test_multiprocessing.py Lib/test/test_smtplib.py Misc/NEWS
by antoine.pitrou 01 May '10

01 May '10

Author: antoine.pitrou Date: Sat May 1 01:08:48 2010 New Revision: 80669 Log: Issue #8576: Remove use of find_unused_port() in test_smtplib and test_multiprocessing. Patch by Paul Moore. Modified: python/trunk/Lib/test/test_multiprocessing.py python/trunk/Lib/test/test_smtplib.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/test/test_multiprocessing.py ============================================================================== --- python/trunk/Lib/test/test_multiprocessing.py (original) +++ python/trunk/Lib/test/test_multiprocessing.py Sat May 1 01:08:48 2010 @@ -1262,9 +1262,9 @@ def test_rapid_restart(self): authkey = os.urandom(32) - port = test_support.find_unused_port() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=('localhost', 0), authkey=authkey, serializer=SERIALIZER) + addr = manager.get_server().address manager.start() p = self.Process(target=self._putter, args=(manager.address, authkey)) @@ -1274,7 +1274,7 @@ del queue manager.shutdown() manager = QueueManager( - address=('localhost', port), authkey=authkey, serializer=SERIALIZER) + address=addr, authkey=authkey, serializer=SERIALIZER) manager.start() manager.shutdown() Modified: python/trunk/Lib/test/test_smtplib.py ============================================================================== --- python/trunk/Lib/test/test_smtplib.py (original) +++ python/trunk/Lib/test/test_smtplib.py Sat May 1 01:08:48 2010 @@ -155,8 +155,10 @@ self._threads = test_support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = test_support.find_unused_port() - self.serv = smtpd.DebuggingServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = smtpd.DebuggingServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() @@ -392,8 +394,10 @@ self._threads = test_support.threading_setup() self.serv_evt = threading.Event() self.client_evt = threading.Event() - self.port = test_support.find_unused_port() - self.serv = SimSMTPServer((HOST, self.port), ('nowhere', -1)) + # Pick a random unused port by passing 0 for the port number + self.serv = SimSMTPServer((HOST, 0), ('nowhere', -1)) + # Keep a note of what port was assigned + self.port = self.serv.socket.getsockname()[1] serv_args = (self.serv, self.serv_evt, self.client_evt) self.thread = threading.Thread(target=debugging_server, args=serv_args) self.thread.start() Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Sat May 1 01:08:48 2010 @@ -134,6 +134,9 @@ Tests ----- +- Issue #8576: Remove use of find_unused_port() in test_smtplib and + test_multiprocessing. Patch by Paul Moore. + - Issue #7449: Fix many tests to support Python compiled without thread support. Patches written by Jerry Seutter.

1 0

r80668 - in sandbox/trunk/2to3/lib2to3: fixes/fix_operator.py main.py patcomp.py pgen2/tokenize.py pytree.py refactor.py tests/test_parser.py tests/test_pytree.py tests/test_refactor.py
by jeffrey.yasskin 01 May '10

01 May '10

Author: jeffrey.yasskin Date: Sat May 1 01:02:47 2010 New Revision: 80668 Log: Make 2to3 run under Python 2.5 so that the benchmark suite at http://hg.python.org/benchmarks/ can use it and still run on implementations that haven't gotten to 2.6 yet. Fixes issue 8566. Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py sandbox/trunk/2to3/lib2to3/main.py sandbox/trunk/2to3/lib2to3/patcomp.py sandbox/trunk/2to3/lib2to3/pgen2/tokenize.py sandbox/trunk/2to3/lib2to3/pytree.py sandbox/trunk/2to3/lib2to3/refactor.py sandbox/trunk/2to3/lib2to3/tests/test_parser.py sandbox/trunk/2to3/lib2to3/tests/test_pytree.py sandbox/trunk/2to3/lib2to3/tests/test_refactor.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_operator.py Sat May 1 01:02:47 2010 @@ -14,10 +14,10 @@ func = "'(' func=any ')'" PATTERN = """ power< module='operator' - trailer< '.' {methods} > trailer< {func} > > + trailer< '.' %(methods)s > trailer< %(func)s > > | - power< {methods} trailer< {func} > > - """.format(methods=methods, func=func) + power< %(methods)s trailer< %(func)s > > + """ % dict(methods=methods, func=func) def transform(self, node, results): method = results["method"][0] Modified: sandbox/trunk/2to3/lib2to3/main.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/main.py (original) +++ sandbox/trunk/2to3/lib2to3/main.py Sat May 1 01:02:47 2010 @@ -2,6 +2,8 @@ Main program for 2to3. """ +from __future__ import with_statement + import sys import os import difflib Modified: sandbox/trunk/2to3/lib2to3/patcomp.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/patcomp.py (original) +++ sandbox/trunk/2to3/lib2to3/patcomp.py Sat May 1 01:02:47 2010 @@ -57,7 +57,7 @@ tokens = tokenize_wrapper(input) try: root = self.driver.parse_tokens(tokens, debug=debug) - except parse.ParseError as e: + except parse.ParseError, e: raise PatternSyntaxError(str(e)) return self.compile_node(root) Modified: sandbox/trunk/2to3/lib2to3/pgen2/tokenize.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/pgen2/tokenize.py (original) +++ sandbox/trunk/2to3/lib2to3/pgen2/tokenize.py Sat May 1 01:02:47 2010 @@ -38,6 +38,13 @@ "generate_tokens", "untokenize"] del token +try: + bytes +except NameError: + # Support bytes type in Python <= 2.5, so 2to3 turns itself into + # valid Python 3 code. + bytes = str + def group(*choices): return '(' + '|'.join(choices) + ')' def any(*choices): return group(*choices) + '*' def maybe(*choices): return group(*choices) + '?' @@ -265,7 +272,7 @@ try: return readline() except StopIteration: - return b'' + return bytes() def find_cookie(line): try: Modified: sandbox/trunk/2to3/lib2to3/pytree.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/pytree.py (original) +++ sandbox/trunk/2to3/lib2to3/pytree.py Sat May 1 01:02:47 2010 @@ -289,8 +289,7 @@ for node in child.post_order(): yield node - @property - def prefix(self): + def _prefix_getter(self): """ The whitespace and comments preceding this node in the input. """ @@ -298,11 +297,12 @@ return "" return self.children[0].prefix - @prefix.setter - def prefix(self, prefix): + def _prefix_setter(self, prefix): if self.children: self.children[0].prefix = prefix + prefix = property(_prefix_getter, _prefix_setter) + def set_child(self, i, child): """ Equivalent to 'node.children[i] = child'. This method also sets the @@ -390,18 +390,17 @@ """Return a pre-order iterator for the tree.""" yield self - @property - def prefix(self): + def _prefix_getter(self): """ The whitespace and comments preceding this token in the input. """ return self._prefix - @prefix.setter - def prefix(self, prefix): + def _prefix_setter(self, prefix): self.changed() self._prefix = prefix + prefix = property(_prefix_getter, _prefix_setter) def convert(gr, raw_node): """ Modified: sandbox/trunk/2to3/lib2to3/refactor.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/refactor.py (original) +++ sandbox/trunk/2to3/lib2to3/refactor.py Sat May 1 01:02:47 2010 @@ -8,6 +8,8 @@ provides infrastructure to write your own refactoring tool. """ +from __future__ import with_statement + __author__ = "Guido van Rossum <guido(a)python.org>" @@ -126,7 +128,7 @@ have_docstring = False gen = tokenize.generate_tokens(StringIO.StringIO(source).readline) def advance(): - tok = next(gen) + tok = gen.next() return tok[0], tok[1] ignore = frozenset((token.NEWLINE, tokenize.NL, token.COMMENT)) features = set() Modified: sandbox/trunk/2to3/lib2to3/tests/test_parser.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_parser.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_parser.py Sat May 1 01:02:47 2010 @@ -6,13 +6,14 @@ test_grammar.py files from both Python 2 and Python 3. """ +from __future__ import with_statement + # Testing imports from . import support from .support import driver, test_dir # Python imports import os -import io import sys # Local imports @@ -156,8 +157,9 @@ encoding = tokenize.detect_encoding(fp.readline)[0] self.assertTrue(encoding is not None, "can't detect encoding for %s" % filepath) - with io.open(filepath, "r", encoding=encoding) as fp: + with open(filepath, "r") as fp: source = fp.read() + source = source.decode(encoding) tree = driver.parse_string(source) new = unicode(tree) if diff(filepath, new, encoding): @@ -203,9 +205,9 @@ def diff(fn, result, encoding): - f = io.open("@", "w", encoding=encoding) + f = open("@", "w") try: - f.write(result) + f.write(result.encode(encoding)) finally: f.close() try: Modified: sandbox/trunk/2to3/lib2to3/tests/test_pytree.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_pytree.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_pytree.py Sat May 1 01:02:47 2010 @@ -9,6 +9,9 @@ especially when debugging a test. """ +from __future__ import with_statement + +import sys import warnings # Testing imports @@ -28,20 +31,22 @@ """Unit tests for nodes (Base, Leaf, Node).""" - def test_deprecated_prefix_methods(self): - l = pytree.Leaf(100, "foo") - with warnings.catch_warnings(record=True) as w: - warnings.simplefilter("always", DeprecationWarning) - self.assertEqual(l.get_prefix(), "") - l.set_prefix("hi") - self.assertEqual(l.prefix, "hi") - self.assertEqual(len(w), 2) - for warning in w: - self.assertTrue(warning.category is DeprecationWarning) - self.assertEqual(str(w[0].message), "get_prefix() is deprecated; " \ - "use the prefix property") - self.assertEqual(str(w[1].message), "set_prefix() is deprecated; " \ - "use the prefix property") + if sys.version_info >= (2,6): + # warnings.catch_warnings is new in 2.6. + def test_deprecated_prefix_methods(self): + l = pytree.Leaf(100, "foo") + with warnings.catch_warnings(record=True) as w: + warnings.simplefilter("always", DeprecationWarning) + self.assertEqual(l.get_prefix(), "") + l.set_prefix("hi") + self.assertEqual(l.prefix, "hi") + self.assertEqual(len(w), 2) + for warning in w: + self.assertTrue(warning.category is DeprecationWarning) + self.assertEqual(str(w[0].message), "get_prefix() is deprecated; " \ + "use the prefix property") + self.assertEqual(str(w[1].message), "set_prefix() is deprecated; " \ + "use the prefix property") def test_instantiate_base(self): if __debug__: Modified: sandbox/trunk/2to3/lib2to3/tests/test_refactor.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_refactor.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_refactor.py Sat May 1 01:02:47 2010 @@ -2,6 +2,8 @@ Unit tests for refactor.py. """ +from __future__ import with_statement + import sys import os import codecs

1 0

Daily py3k reference leaks (r80666): sum=0
by solipsis＠pitrou.net 01 May '10

01 May '10

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

1 0

r80667 - in peps/trunk: pep-0001.txt pep-3147.txt pep0/pep.py
by barry.warsaw 01 May '10

01 May '10

Author: barry.warsaw Date: Fri Apr 30 21:21:52 2010 New Revision: 80667 Log: Support the Resolution header, required for Standards Track PEPs. Modified: peps/trunk/pep-0001.txt peps/trunk/pep-3147.txt peps/trunk/pep0/pep.py Modified: peps/trunk/pep-0001.txt ============================================================================== --- peps/trunk/pep-0001.txt (original) +++ peps/trunk/pep-0001.txt Fri Apr 30 21:21:52 2010 @@ -280,6 +280,7 @@ Post-History: <dates of postings to python-list and python-dev> * Replaces: <pep number> * Replaced-By: <pep number> + * Resolution: <url> The Author header lists the names, and optionally the email addresses of all the authors/owners of the PEP. The format of the Author header @@ -301,6 +302,10 @@ email addresses in PEPs will be obscured as a defense against spam harvesters. +*Note: The Resolution header is required for Standards Track PEPs +only. It contains a URL that should point to an email message or +other web resource where the pronouncement about the PEP is made.* + While a PEP is in private discussions (usually during the initial Draft phase), a Discussions-To header will indicate the mailing list or URL where the PEP is being discussed. No Discussions-To header is Modified: peps/trunk/pep-3147.txt ============================================================================== --- peps/trunk/pep-3147.txt (original) +++ peps/trunk/pep-3147.txt Fri Apr 30 21:21:52 2010 @@ -9,8 +9,7 @@ Created: 2009-12-16 Python-Version: 3.2 Post-History: 2010-01-30, 2010-02-25, 2010-03-03, 2010-04-12 - -Accepted: http://mail.python.org/pipermail/python-dev/2010-April/099414.html +Resolution: http://mail.python.org/pipermail/python-dev/2010-April/099414.html Abstract Modified: peps/trunk/pep0/pep.py ============================================================================== --- peps/trunk/pep0/pep.py (original) +++ peps/trunk/pep0/pep.py Fri Apr 30 21:21:52 2010 @@ -106,10 +106,10 @@ def _last_name(self, full_name): """Find the last name (or nickname) of a full name. - If no last name (e.g, 'Aahz') then return the full name. If there is a - leading, lowercase portion to the last name (e.g., 'van' or 'von') then - include it. If there is a suffix (e.g., 'Jr.') that is appended through a - comma, then drop the suffix. + If no last name (e.g, 'Aahz') then return the full name. If there is + a leading, lowercase portion to the last name (e.g., 'van' or 'von') + then include it. If there is a suffix (e.g., 'Jr.') that is appended + through a comma, then drop the suffix. """ name_partition = full_name.partition(u',') @@ -154,18 +154,19 @@ # The second item in the nested tuples represents if the header is # required or not. headers = (('PEP', True), ('Title', True), ('Version', True), - ('Last-Modified', True), ('Author', True), - ('Discussions-To', False), ('Status', True), ('Type', True), - ('Content-Type', False), ('Requires', False), - ('Created', True), ('Python-Version', False), - ('Post-History', False), ('Replaces', False), - ('Replaced-By', False)) + ('Last-Modified', True), ('Author', True), + ('Discussions-To', False), ('Status', True), ('Type', True), + ('Content-Type', False), ('Requires', False), + ('Created', True), ('Python-Version', False), + ('Post-History', False), ('Replaces', False), + ('Replaced-By', False), ('Resolution', False), + ) # Valid values for the Type header. type_values = (u"Standards Track", u"Informational", u"Process") # Valid values for the Status header. # Active PEPs can only be for Informational or Process PEPs. - status_values = (u"Accepted", u"Rejected", u"Withdrawn", u"Deferred", u"Final", - u"Active", u"Draft", u"Replaced") + status_values = (u"Accepted", u"Rejected", u"Withdrawn", u"Deferred", + u"Final", u"Active", u"Draft", u"Replaced") def __init__(self, pep_file): """Init object from an open PEP file object."""

1 0

r80666 - in python/branches/py3k: configure configure.in
by marc-andre.lemburg 30 Apr '10

30 Apr '10

Author: marc-andre.lemburg Date: Fri Apr 30 19:29:56 2010 New Revision: 80666 Log: Merged revisions 80665 via svnmerge from svn+pythonssh://pythondev@svn.python.org/python/trunk ........ r80665 | marc-andre.lemburg | 2010-04-30 19:20:14 +0200 (Fri, 30 Apr 2010) | 7 lines [issue8211] configure: ignore AC_PROG_CC hardcoded CFLAGS Only override the AC_PROG_CC determined CFLAGS if they were set by the user. This restores the default behavior in the common case of not having CFLAGS defined when running configure. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/configure python/branches/py3k/configure.in Modified: python/branches/py3k/configure ============================================================================== --- python/branches/py3k/configure (original) +++ python/branches/py3k/configure Fri Apr 30 19:29:56 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 80576 . +# From configure.in Revision: 80648 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.65 for python 3.2. # @@ -3176,7 +3176,9 @@ (it is also a good idea to do 'make clean' before compiling)" "$LINENO" 5 fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3968,7 +3970,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi Modified: python/branches/py3k/configure.in ============================================================================== --- python/branches/py3k/configure.in (original) +++ python/branches/py3k/configure.in Fri Apr 30 19:29:56 2010 @@ -478,9 +478,14 @@ (it is also a good idea to do 'make clean' before compiling)]) fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" AC_PROG_CC -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi AC_SUBST(CXX) AC_SUBST(MAINCC)

1 0

r80665 - in python/trunk: configure configure.in
by marc-andre.lemburg 30 Apr '10

30 Apr '10

Author: marc-andre.lemburg Date: Fri Apr 30 19:20:14 2010 New Revision: 80665 Log: [issue8211] configure: ignore AC_PROG_CC hardcoded CFLAGS Only override the AC_PROG_CC determined CFLAGS if they were set by the user. This restores the default behavior in the common case of not having CFLAGS defined when running configure. Modified: python/trunk/configure python/trunk/configure.in Modified: python/trunk/configure ============================================================================== --- python/trunk/configure (original) +++ python/trunk/configure Fri Apr 30 19:20:14 2010 @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 80574 . +# From configure.in Revision: 80647 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for python 2.7. # @@ -2407,7 +2407,9 @@ { (exit 1); exit 1; }; } fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -3327,7 +3329,10 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi @@ -3938,7 +3943,7 @@ { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -rm -f -r conftest* +rm -f conftest* @@ -5510,7 +5515,7 @@ else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -5531,7 +5536,7 @@ else ac_cv_header_stdc=no fi -rm -f -r conftest* +rm -f conftest* fi @@ -6631,7 +6636,7 @@ fi -rm -f -r conftest* +rm -f conftest* { echo "$as_me:$LINENO: result: $was_it_defined" >&5 echo "${ECHO_T}$was_it_defined" >&6; } @@ -7168,7 +7173,7 @@ else ac_cv_type_uid_t=no fi -rm -f -r conftest* +rm -f conftest* fi { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 @@ -15991,7 +15996,7 @@ else unistd_defines_pthreads=no fi -rm -f -r conftest* +rm -f conftest* { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5 echo "${ECHO_T}$unistd_defines_pthreads" >&6; } @@ -17605,7 +17610,7 @@ $EGREP "yes" >/dev/null 2>&1; then ipv6type=$i fi -rm -f -r conftest* +rm -f conftest* ;; kame) @@ -17628,7 +17633,7 @@ ipv6libdir=/usr/local/v6/lib ipv6trylibc=yes fi -rm -f -r conftest* +rm -f conftest* ;; linux-glibc) @@ -17649,7 +17654,7 @@ ipv6type=$i; ipv6trylibc=yes fi -rm -f -r conftest* +rm -f conftest* ;; linux-inet6) @@ -17687,7 +17692,7 @@ ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib fi -rm -f -r conftest* +rm -f conftest* ;; v6d) @@ -17710,7 +17715,7 @@ ipv6libdir=/usr/local/v6/lib; BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS" fi -rm -f -r conftest* +rm -f conftest* ;; zeta) @@ -17732,7 +17737,7 @@ ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib fi -rm -f -r conftest* +rm -f conftest* ;; esac @@ -26278,7 +26283,7 @@ _ACEOF fi -rm -f -r conftest* +rm -f conftest* cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -26297,7 +26302,7 @@ _ACEOF fi -rm -f -r conftest* +rm -f conftest* fi @@ -26567,7 +26572,7 @@ _ACEOF fi -rm -f -r conftest* +rm -f conftest* fi Modified: python/trunk/configure.in ============================================================================== --- python/trunk/configure.in (original) +++ python/trunk/configure.in Fri Apr 30 19:20:14 2010 @@ -531,9 +531,14 @@ (it is also a good idea to do 'make clean' before compiling)]) fi -save_CFLAGS=$CFLAGS +# If the user set CFLAGS, use this instead of the automatically +# determined setting +preset_cflags="$CFLAGS" AC_PROG_CC -CFLAGS=$save_CFLAGS +if test ! -z "$preset_cflags" +then + CFLAGS=$preset_cflags +fi AC_SUBST(CXX) AC_SUBST(MAINCC)

1 0