Mailman 3 December 2008 - Python-checkins

r68092 - python/trunk/Lib/ssl.py
by benjamin.peterson 01 Jan '09

01 Jan '09

Author: benjamin.peterson Date: Wed Dec 31 05:08:55 2008 New Revision: 68092 Log: fix name collision issues Modified: python/trunk/Lib/ssl.py Modified: python/trunk/Lib/ssl.py ============================================================================== --- python/trunk/Lib/ssl.py (original) +++ python/trunk/Lib/ssl.py Wed Dec 31 05:08:55 2008 @@ -74,7 +74,7 @@ SSL_ERROR_EOF, \ SSL_ERROR_INVALID_ERROR_CODE -from socket import socket, _fileobject +from socket import socket, _fileobject, error as socket_error from socket import getnameinfo as _getnameinfo import base64 # for DER-to-PEM translation @@ -103,7 +103,7 @@ # see if it's connected try: socket.getpeername(self) - except socket.error: + except socket_error: # no, no connection yet self._sslobj = None else: @@ -441,7 +441,7 @@ PROTOCOL_SSLv23, None) try: sock.getpeername() - except socket.error: + except socket_error: # no, no connection yet pass else:

3 2

r68112 - in python/trunk: Lib/inspect.py Misc/NEWS
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Thu Jan 1 00:48:39 2009 New Revision: 68112 Log: #4795 inspect.isgeneratorfunction() should return False instead of None Modified: python/trunk/Lib/inspect.py python/trunk/Misc/NEWS Modified: python/trunk/Lib/inspect.py ============================================================================== --- python/trunk/Lib/inspect.py (original) +++ python/trunk/Lib/inspect.py Thu Jan 1 00:48:39 2009 @@ -161,6 +161,7 @@ if (isfunction(object) or ismethod(object)) and \ object.func_code.co_flags & CO_GENERATOR: return True + return False def isgenerator(object): """Return true if the object is a generator. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Thu Jan 1 00:48:39 2009 @@ -100,6 +100,9 @@ Library ------- +- Issue #4795: inspect.isgeneratorfunction() returns False instead of None when + the function is not a generator. + - Issue #4702: Throwing a DistutilsPlatformError instead of IOError in case no MSVC compiler is found under Windows. Original patch by Philip Jenvey.

1 0

r68111 - sandbox/trunk/release/release.py
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Thu Jan 1 00:30:10 2009 New Revision: 68111 Log: add some basic (and untested) support for uploading a release to dinsdale Modified: sandbox/trunk/release/release.py Modified: sandbox/trunk/release/release.py ============================================================================== --- sandbox/trunk/release/release.py (original) +++ sandbox/trunk/release/release.py Thu Jan 1 00:30:10 2009 @@ -65,6 +65,8 @@ p.add_option('-e', '--export', default=False, action='store_true', help='Export the SVN tag to a tarball and build docs') + p.add_option('-u', '--upload', metavar="username", + help='Upload the tarballs and docs to dinsdale') p.add_option('-m', '--branch', default=False, action='store_true', help='create a maintance branch to go along with the release') @@ -215,8 +217,9 @@ def tarball(source): """Build tarballs for a directory.""" print 'Making .tgz' - tgz = source + '.tgz' - bz = source + '.tar.bz2' + base = os.path.basename(source) + tgz = base + '.tgz' + bz = base + '.tar.bz2' run_cmd(['tar cf - %s | gzip -9 > %s' % (source, tgz)]) print "Making .tar.bz2" run_cmd(['tar cf - %s | bzip2 -9 > %s' % @@ -278,8 +281,10 @@ if filename.endswith('.pyc'): os.remove(os.path.join(dirpath, filename)) - tarball(archivename) - print '\n**Now extract the archives and run the tests**' + os.mkdir('src') + with changed_dir('src'): + tarball(os.path.join("..", archivename)) + print '\n**Now extract the archives in dist/src and run the tests**' print '**You may also want to run make install and re-test**' @@ -290,6 +295,19 @@ run_cmd(['make', 'dist']) return os.path.abspath('dist') +def upload(tag, username): + """scp everything to dinsdale""" + address ='"%s(a)dinsdale.python.org:' % username + def scp(from_loc, to_loc): + run_cmd(['scp %s %s' % (from_loc, to_loc)]) + with changed_dir('dist'): + print "Uploading source tarballs" + scp('src', '/data/python-releases/%s' % tag.nickname) + print "Upload doc tarballs" + scp('docs', '/data/python-releases/doc/%s' % tag.nickname) + print "* Now change the permissions on the tarballs so they are " \ + "writable by the webmaster group. *" + class Tag(object): @@ -396,7 +414,7 @@ parser.print_usage() sys.exit(1) tag = Tag(args[1]) - if not options.export: + if not (options.export or options.upload): check_env() if options.bump: bump(tag) @@ -406,6 +424,8 @@ branch(tag) if options.export: export(tag) + if options.upload: + upload(tag, options.upload) if options.done: done(tag)

1 0

Python Regression Test Failures doc (1)
by Neal Norwitz 31 Dec '08

31 Dec '08

svn update tools/sphinx At revision 68110. svn update tools/docutils At revision 68110. svn update tools/jinja At revision 68110. svn update tools/pygments At revision 68110. mkdir -p build/html build/doctrees python tools/sphinx-build.py -b html -d build/doctrees -D latex_paper_size= . build/html Sphinx v0.5, building html Exception occurred: File "/home/neal/python/trunk/Doc/tools/sphinx/jinja/loaders.py", line 20, in <module> from jinja.utils import CacheDict, raise_syntax_error ImportError: cannot import name raise_syntax_error The full traceback has been saved in /tmp/sphinx-err-F9w3Qk.log, if you want to report the issue to the author. Please also report this if it was a user error, so that a better error message can be provided next time. Send reports to sphinx-dev(a)googlegroups.com. Thanks! make: *** [build] Error 1

1 0

r68110 - sandbox/trunk/2to3/lib2to3/fixes/fix_long.py
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Wed Dec 31 21:13:26 2008 New Revision: 68110 Log: remove unused import Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_long.py Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_long.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_long.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_long.py Wed Dec 31 21:13:26 2008 @@ -5,7 +5,6 @@ """ # Local imports -from .. import pytree from .. import fixer_base from ..fixer_util import Name, Number, is_probably_builtin

1 0

r68109 - sandbox/trunk/io-c/test_io.py
by antoine.pitrou 31 Dec '08

31 Dec '08

Author: antoine.pitrou Date: Wed Dec 31 20:09:51 2008 New Revision: 68109 Log: don't use a valid but dummy position Modified: sandbox/trunk/io-c/test_io.py Modified: sandbox/trunk/io-c/test_io.py ============================================================================== --- sandbox/trunk/io-c/test_io.py (original) +++ sandbox/trunk/io-c/test_io.py Wed Dec 31 20:09:51 2008 @@ -47,7 +47,7 @@ pass def tell(self): - return 42 + return -1 def readinto(self, buf): max_len = len(buf)

1 0

r68108 - in sandbox/trunk/2to3/lib2to3: fixer_util.py tests/test_fixers.py
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Wed Dec 31 19:00:12 2008 New Revision: 68108 Log: don't change long even if it's the only argument name Modified: sandbox/trunk/2to3/lib2to3/fixer_util.py sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Modified: sandbox/trunk/2to3/lib2to3/fixer_util.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixer_util.py (original) +++ sandbox/trunk/2to3/lib2to3/fixer_util.py Wed Dec 31 19:00:12 2008 @@ -236,10 +236,12 @@ if parent.type == syms.expr_stmt and parent.children[0] is node: # Assignment. return False - if parent.type == syms.typedargslist and ( - (prev is not None and prev.type == token.COMMA) or - parent.children[0] is node - ): + if parent.type == syms.parameters or \ + (parent.type == syms.typedargslist and ( + (prev is not None and prev.type == token.COMMA) or + parent.children[0] is node + )): + # The name of an argument. return False return True Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Wed Dec 31 19:00:12 2008 @@ -1084,6 +1084,9 @@ s = """class long(): pass""" self.unchanged(s) + s = """def f(long): pass""" + self.unchanged(s) + s = """def f(g, long): pass""" self.unchanged(s)

1 0

r68107 - sandbox/trunk/2to3/lib2to3/tests/test_fixers.py
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Wed Dec 31 18:55:10 2008 New Revision: 68107 Log: add another test Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Wed Dec 31 18:55:10 2008 @@ -1084,6 +1084,9 @@ s = """class long(): pass""" self.unchanged(s) + s = """def f(g, long): pass""" + self.unchanged(s) + s = """def f(x, long=True): pass""" self.unchanged(s)

1 0

r68106 - in sandbox/trunk/2to3/lib2to3: fixer_util.py fixes/fix_long.py tests/test_fixers.py
by benjamin.peterson 31 Dec '08

31 Dec '08

Author: benjamin.peterson Date: Wed Dec 31 18:53:58 2008 New Revision: 68106 Log: #2734 don't convert every instance of long (eg if it's an attribute) Modified: sandbox/trunk/2to3/lib2to3/fixer_util.py sandbox/trunk/2to3/lib2to3/fixes/fix_long.py sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Modified: sandbox/trunk/2to3/lib2to3/fixer_util.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixer_util.py (original) +++ sandbox/trunk/2to3/lib2to3/fixer_util.py Wed Dec 31 18:53:58 2008 @@ -222,6 +222,27 @@ return True return False +def is_probably_builtin(node): + """ + Check that something isn't an attribute or function name etc. + """ + prev = node.get_prev_sibling() + if prev is not None and prev.type == token.DOT: + # Attribute lookup. + return False + parent = node.parent + if parent.type in (syms.funcdef, syms.classdef): + return False + if parent.type == syms.expr_stmt and parent.children[0] is node: + # Assignment. + return False + if parent.type == syms.typedargslist and ( + (prev is not None and prev.type == token.COMMA) or + parent.children[0] is node + ): + return False + return True + ########################################################### ### The following functions are to find bindings in a suite ########################################################### Modified: sandbox/trunk/2to3/lib2to3/fixes/fix_long.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/fixes/fix_long.py (original) +++ sandbox/trunk/2to3/lib2to3/fixes/fix_long.py Wed Dec 31 18:53:58 2008 @@ -7,18 +7,17 @@ # Local imports from .. import pytree from .. import fixer_base -from ..fixer_util import Name, Number +from ..fixer_util import Name, Number, is_probably_builtin class FixLong(fixer_base.BaseFix): PATTERN = "'long'" - static_long = Name("long") static_int = Name("int") def transform(self, node, results): - assert node == self.static_long, node - new = self.static_int.clone() - new.set_prefix(node.get_prefix()) - return new + if is_probably_builtin(node): + new = self.static_int.clone() + new.set_prefix(node.get_prefix()) + return new Modified: sandbox/trunk/2to3/lib2to3/tests/test_fixers.py ============================================================================== --- sandbox/trunk/2to3/lib2to3/tests/test_fixers.py (original) +++ sandbox/trunk/2to3/lib2to3/tests/test_fixers.py Wed Dec 31 18:53:58 2008 @@ -1071,6 +1071,22 @@ a = """z = type(x) in (int, int)""" self.check(b, a) + def test_unchanged(self): + s = """long = True""" + self.unchanged(s) + + s = """s.long = True""" + self.unchanged(s) + + s = """def long(): pass""" + self.unchanged(s) + + s = """class long(): pass""" + self.unchanged(s) + + s = """def f(x, long=True): pass""" + self.unchanged(s) + def test_prefix_preservation(self): b = """x = long( x )""" a = """x = int( x )"""

1 0

r68105 - sandbox/trunk/iobench/iobench.py
by antoine.pitrou 31 Dec '08

31 Dec '08

Author: antoine.pitrou Date: Wed Dec 31 18:19:29 2008 New Revision: 68105 Log: use OptionParser, and fix a test which can't be run in text mode (because of relative seeks) Modified: sandbox/trunk/iobench/iobench.py Modified: sandbox/trunk/iobench/iobench.py ============================================================================== --- sandbox/trunk/iobench/iobench.py (original) +++ sandbox/trunk/iobench/iobench.py Wed Dec 31 18:19:29 2008 @@ -7,6 +7,7 @@ import sys import hashlib import functools +from optparse import OptionParser out = sys.stdout @@ -104,7 +105,7 @@ for i in xrange(0, size - 1, 1000): f.seek(i, 0) -@with_open_mode("r") +@with_open_mode("rb") @with_sizes("medium") def read_seek_bytewise(f): """ alternate read & seek one unit """ @@ -112,7 +113,7 @@ while f.read(1): f.seek(1, 1) -@with_open_mode("r") +@with_open_mode("rb") @with_sizes("medium") def read_seek_blockwise(f): """ alternate read & seek 1000 units """ @@ -296,8 +297,6 @@ } file_sizes = list(get_file_sizes()) - options = options or "rwbt" - if "b" in options: print("Binary unit = one byte") if "t" in options: @@ -393,15 +392,44 @@ f.write(head) f.write(tail) -def main(options=None): +def main(): + usage = "usage: %prog [-h|--help] [options]" + parser = OptionParser(usage=usage) + parser.add_option("-b", "--binary", + action="store_true", dest="binary", default=False, + help="run binary I/O tests") + parser.add_option("-t", "--text", + action="store_true", dest="text", default=False, + help="run text I/O tests") + parser.add_option("-r", "--read", + action="store_true", dest="read", default=False, + help="run read tests") + parser.add_option("-w", "--write", + action="store_true", dest="write", default=False, + help="run write & modify tests") + options, args = parser.parse_args() + if args: + parser.error("unexpected arguments") + + test_options = "" + if options.read: + test_options += "r" + if options.write: + test_options += "w" + elif not options.read: + test_options += "rw" + if options.text: + test_options += "t" + if options.binary: + test_options += "b" + elif not options.text: + test_options += "tb" + prepare_files() - run_all_tests(options) + run_all_tests(test_options) if __name__ == "__main__": - if len(sys.argv) > 1: - main(sys.argv[1]) - else: - main() + main() # -- This part to exercise text reading. Don't change anything! --

1 0