Mailman 3 November 2010 - Python-checkins

r86763 - in python/branches/release27-maint: Lib/test/test_xml_etree.py
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 08:29:03 2010 New Revision: 86763 Log: Merged revisions 85459-85465 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85459 | georg.brandl | 2010-10-14 09:23:01 +0200 (Do, 14 Okt 2010) | 1 line #9964: Fix failure of test_dis under -OO. ........ r85460 | georg.brandl | 2010-10-14 09:24:28 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix running test_import under -O or -OO. ........ r85461 | georg.brandl | 2010-10-14 09:29:08 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix lib2to3 fixer fix_operator when running under -OO. ........ r85462 | georg.brandl | 2010-10-14 09:32:52 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix running test_xml_etree under -OO. ........ r85463 | georg.brandl | 2010-10-14 09:34:56 +0200 (Do, 14 Okt 2010) | 1 line Better check for "any optimize option given". ........ r85464 | georg.brandl | 2010-10-14 09:42:27 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix running test_compileall under -O and -OO. ........ r85465 | georg.brandl | 2010-10-14 10:08:56 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix running test_cmd_line_script under -O and -OO. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Lib/test/test_xml_etree.py Modified: python/branches/release27-maint/Lib/test/test_xml_etree.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_xml_etree.py (original) +++ python/branches/release27-maint/Lib/test/test_xml_etree.py Fri Nov 26 08:29:03 2010 @@ -1829,6 +1829,10 @@ checkwarnings = None def __init__(self, quiet=False): + if sys.flags.optimize >= 2: + # under -OO, doctests cannot be run and therefore not all warnings + # will be emitted + quiet = True deprecations = ( # Search behaviour is broken if search path starts with "/". ("This search is broken in 1.3 and earlier, and will be fixed "

1 0

r86762 - python/branches/release27-maint
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 08:23:36 2010 New Revision: 86762 Log: Blocked revisions 85287,85354-85355,85357,85375,85456-85458 via svnmerge ........ r85287 | georg.brandl | 2010-10-06 14:29:49 +0200 (Mi, 06 Okt 2010) | 1 line Update to Sphin 1.0.4. ........ r85354 | georg.brandl | 2010-10-10 11:37:51 +0200 (So, 10 Okt 2010) | 1 line Update pydoc topics. ........ r85355 | georg.brandl | 2010-10-10 11:40:34 +0200 (So, 10 Okt 2010) | 1 line Bump to 3.2a3. ........ r85357 | georg.brandl | 2010-10-10 11:49:21 +0200 (So, 10 Okt 2010) | 1 line Rewrap. ........ r85375 | georg.brandl | 2010-10-12 14:38:48 +0200 (Di, 12 Okt 2010) | 1 line Post-release bumps. ........ r85456 | georg.brandl | 2010-10-14 09:04:07 +0200 (Do, 14 Okt 2010) | 1 line #9418: first step of moving private string methods to _string module. ........ r85457 | georg.brandl | 2010-10-14 09:14:31 +0200 (Do, 14 Okt 2010) | 1 line #9964: fix pdb failure to import under -OO. Warn the user that help is simply not available in this case. ........ r85458 | georg.brandl | 2010-10-14 09:17:44 +0200 (Do, 14 Okt 2010) | 1 line Remove unused imports. ........ Modified: python/branches/release27-maint/ (props changed)

1 0

r86761 - in python/branches/release27-maint: Doc/library/zipfile.rst Lib/test/test_zipfile.py Lib/zipfile.py Misc/NEWS
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 08:22:28 2010 New Revision: 86761 Log: Merged revisions 85455 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85455 | georg.brandl | 2010-10-14 08:59:45 +0200 (Do, 14 Okt 2010) | 1 line #1710703: write zipfile structures also in the case of closing a new, but empty, archive. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Doc/library/zipfile.rst python/branches/release27-maint/Lib/test/test_zipfile.py python/branches/release27-maint/Lib/zipfile.py python/branches/release27-maint/Misc/NEWS Modified: python/branches/release27-maint/Doc/library/zipfile.rst ============================================================================== --- python/branches/release27-maint/Doc/library/zipfile.rst (original) +++ python/branches/release27-maint/Doc/library/zipfile.rst Fri Nov 26 08:22:28 2010 @@ -122,6 +122,10 @@ and :program:`unzip` commands on Unix (the InfoZIP utilities) don't support these extensions. + If the file is created with mode ``'a'`` or ``'w'`` and then + :meth:`close`\ d without adding any files to the archive, the appropriate + ZIP structures for an empty archive will be written to the file. + ZipFile is also a context manager and therefore supports the :keyword:`with` statement. In the example, *myzip* is closed after the :keyword:`with` statement's suite is finished---even if an exception occurs:: Modified: python/branches/release27-maint/Lib/test/test_zipfile.py ============================================================================== --- python/branches/release27-maint/Lib/test/test_zipfile.py (original) +++ python/branches/release27-maint/Lib/test/test_zipfile.py Fri Nov 26 08:22:28 2010 @@ -949,6 +949,31 @@ def test_read_return_size_deflated(self): self.check_read_return_size(zipfile.ZIP_DEFLATED) + def test_empty_zipfile(self): + # Check that creating a file in 'w' or 'a' mode and closing without + # adding any files to the archives creates a valid empty ZIP file + zipf = zipfile.ZipFile(TESTFN, mode="w") + zipf.close() + try: + zipf = zipfile.ZipFile(TESTFN, mode="r") + except zipfile.BadZipFile: + self.fail("Unable to create empty ZIP file in 'w' mode") + + zipf = zipfile.ZipFile(TESTFN, mode="a") + zipf.close() + try: + zipf = zipfile.ZipFile(TESTFN, mode="r") + except: + self.fail("Unable to create empty ZIP file in 'a' mode") + + def test_open_empty_file(self): + # Issue 1710703: Check that opening a file with less than 22 bytes + # raises a BadZipfile exception (rather than the previously unhelpful + # IOError) + f = open(TESTFN, 'w') + f.close() + self.assertRaises(zipfile.BadZipfile, zipfile.ZipFile, TESTFN, 'r') + def tearDown(self): unlink(TESTFN) unlink(TESTFN2) Modified: python/branches/release27-maint/Lib/zipfile.py ============================================================================== --- python/branches/release27-maint/Lib/zipfile.py (original) +++ python/branches/release27-maint/Lib/zipfile.py Fri Nov 26 08:22:28 2010 @@ -158,7 +158,13 @@ """ Read the ZIP64 end-of-archive records and use that to update endrec """ - fpin.seek(offset - sizeEndCentDir64Locator, 2) + try: + fpin.seek(offset - sizeEndCentDir64Locator, 2) + except IOError: + # If the seek fails, the file is not large enough to contain a ZIP64 + # end-of-archive record, so just return the end record we were given. + return endrec + data = fpin.read(sizeEndCentDir64Locator) sig, diskno, reloff, disks = struct.unpack(structEndArchive64Locator, data) if sig != stringEndArchive64Locator: @@ -705,14 +711,22 @@ if key == 'r': self._GetContents() elif key == 'w': - pass + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True elif key == 'a': - try: # See if file is a zip file + try: + # See if file is a zip file self._RealGetContents() # seek to start of directory and overwrite self.fp.seek(self.start_dir, 0) - except BadZipfile: # file is not a zip file, just append + except BadZipfile: + # file is not a zip file, just append self.fp.seek(0, 2) + + # set the modified flag so central directory gets written + # even if no files are added to the archive + self._didModify = True else: if not self._filePassed: self.fp.close() @@ -739,7 +753,10 @@ def _RealGetContents(self): """Read in the table of contents for the ZIP file.""" fp = self.fp - endrec = _EndRecData(fp) + try: + endrec = _EndRecData(fp) + except IOError: + raise BadZipfile("File is not a zip file") if not endrec: raise BadZipfile, "File is not a zip file" if self.debug > 1: Modified: python/branches/release27-maint/Misc/NEWS ============================================================================== --- python/branches/release27-maint/Misc/NEWS (original) +++ python/branches/release27-maint/Misc/NEWS Fri Nov 26 08:22:28 2010 @@ -15,6 +15,10 @@ - Issue #10459: Update CJK character names to Unicode 5.2. +- Issue #1710703: Write structures for an empty ZIP archive when a ZipFile is + created in modes 'a' or 'w' and then closed without adding any files. Raise + BadZipfile (rather than IOError) when opening small non-ZIP files. + - Issue #4493: urllib2 adds '/' in front of path components which does not start with '/. Common behavior exhibited by browsers and other clients.

1 0

r86760 - in python/branches/release27-maint: Doc/library/atexit.rst Doc/library/os.path.rst Tools/README
by georg.brandl Nov. 26, 2010

Nov. 26, 2010

Author: georg.brandl Date: Fri Nov 26 08:21:01 2010 New Revision: 86760 Log: Merged revisions 85253,85452-85454 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85253 | georg.brandl | 2010-10-06 10:52:48 +0200 (Mi, 06 Okt 2010) | 1 line Copyedit of os.symlink() docs. ........ r85452 | georg.brandl | 2010-10-14 08:43:22 +0200 (Do, 14 Okt 2010) | 1 line #10046: small correction to atexit docs. ........ r85453 | georg.brandl | 2010-10-14 08:46:08 +0200 (Do, 14 Okt 2010) | 1 line #6825: small correction to split() docs. ........ r85454 | georg.brandl | 2010-10-14 08:48:47 +0200 (Do, 14 Okt 2010) | 1 line Mention 2to3. ........ Modified: python/branches/release27-maint/ (props changed) python/branches/release27-maint/Doc/library/atexit.rst python/branches/release27-maint/Doc/library/os.path.rst python/branches/release27-maint/Tools/README Modified: python/branches/release27-maint/Doc/library/atexit.rst ============================================================================== --- python/branches/release27-maint/Doc/library/atexit.rst (original) +++ python/branches/release27-maint/Doc/library/atexit.rst Fri Nov 26 08:21:01 2010 @@ -20,8 +20,8 @@ <http://svn.python.org/view/python/branches/release27-maint/Lib/atexit.py?vi…>`_ Note: the functions registered via this module are not called when the program -is killed by a signal, when a Python fatal internal error is detected, or when -:func:`os._exit` is called. +is killed by a signal not handled by Python, when a Python fatal internal error +is detected, or when :func:`os._exit` is called. .. index:: single: exitfunc (in sys) Modified: python/branches/release27-maint/Doc/library/os.path.rst ============================================================================== --- python/branches/release27-maint/Doc/library/os.path.rst (original) +++ python/branches/release27-maint/Doc/library/os.path.rst Fri Nov 26 08:21:01 2010 @@ -268,14 +268,14 @@ .. function:: split(path) - Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the last - pathname component and *head* is everything leading up to that. The *tail* part - will never contain a slash; if *path* ends in a slash, *tail* will be empty. If - there is no slash in *path*, *head* will be empty. If *path* is empty, both - *head* and *tail* are empty. Trailing slashes are stripped from *head* unless - it is the root (one or more slashes only). In nearly all cases, ``join(head, - tail)`` equals *path* (the only exception being when there were multiple slashes - separating *head* from *tail*). + Split the pathname *path* into a pair, ``(head, tail)`` where *tail* is the + last pathname component and *head* is everything leading up to that. The + *tail* part will never contain a slash; if *path* ends in a slash, *tail* + will be empty. If there is no slash in *path*, *head* will be empty. If + *path* is empty, both *head* and *tail* are empty. Trailing slashes are + stripped from *head* unless it is the root (one or more slashes only). In + all cases, ``join(head, tail)`` returns a path to the same location as *path* + (but the strings may differ). .. function:: splitdrive(path) Modified: python/branches/release27-maint/Tools/README ============================================================================== --- python/branches/release27-maint/Tools/README (original) +++ python/branches/release27-maint/Tools/README Fri Nov 26 08:21:01 2010 @@ -30,9 +30,10 @@ pynche A Tkinter-based color editor. -scripts A number of useful single-file programs, e.g. tabnanny.py - (by Tim Peters), which checks for inconsistent mixing - of tabs and spaces. +scripts A number of useful single-file programs, e.g. tabnanny.py + by Tim Peters, which checks for inconsistent mixing of + tabs and spaces, and 2to3, which converts Python 2 code + to Python 3 code. unicode Tools used to generate unicode database files for Python 2.0 (by Fredrik Lundh).

1 0

Daily py3k reference leaks (r86759): sum=0
by solipsis＠pitrou.net Nov. 26, 2010

Nov. 26, 2010

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

1 0

r86759 - python/branches/py3k/Demo/curses/life.py
by senthil.kumaran Nov. 26, 2010

Nov. 26, 2010

Author: senthil.kumaran Date: Fri Nov 26 03:20:04 2010 New Revision: 86759 Log: s/colour/color/g Modified: python/branches/py3k/Demo/curses/life.py Modified: python/branches/py3k/Demo/curses/life.py ============================================================================== --- python/branches/py3k/Demo/curses/life.py (original) +++ python/branches/py3k/Demo/curses/life.py Fri Nov 26 03:20:04 2010 @@ -1,7 +1,7 @@ #!/usr/bin/env python3 # life.py -- A curses-based version of Conway's Game of Life. # Contributed by AMK -# Mouse support and colour by Dafydd Crosby +# Mouse support and color by Dafydd Crosby # # An empty board will be displayed, and the following commands are available: # E : Erase the board @@ -148,7 +148,7 @@ "Display the menu of possible keystroke commands" erase_menu(stdscr, menu_y) - # If colour, then light the menu up :-) + # If color, then light the menu up :-) if curses.has_colors(): stdscr.attrset(curses.color_pair(1)) stdscr.addstr(menu_y, 4, @@ -164,7 +164,7 @@ menu_y = (stdscr_y-3)-1 display_menu(stdscr, menu_y) - # If colour, then initialize the color pairs + # If color, then initialize the color pairs if curses.has_colors(): curses.init_pair(1, curses.COLOR_BLUE, 0) curses.init_pair(2, curses.COLOR_CYAN, 0)

1 0

r86758 - python/branches/py3k/Lib/test/test_compileall.py
by eric.araujo Nov. 26, 2010

Nov. 26, 2010

Author: eric.araujo Date: Fri Nov 26 01:39:59 2010 New Revision: 86758 Log: #10453 follow-up: Fix test_quiet on Windows, thanks to Stephan Krah. Modified: python/branches/py3k/Lib/test/test_compileall.py Modified: python/branches/py3k/Lib/test/test_compileall.py ============================================================================== --- python/branches/py3k/Lib/test/test_compileall.py (original) +++ python/branches/py3k/Lib/test/test_compileall.py Fri Nov 26 01:39:59 2010 @@ -137,7 +137,7 @@ for name, ext, switch in [ ('normal', 'pyc', []), ('optimize', 'pyo', ['-O']), - ('doubleoptimize', 'pyo', ['-OO']) + ('doubleoptimize', 'pyo', ['-OO']), ]: def f(self, ext=ext, switch=switch): retcode = subprocess.call( @@ -200,7 +200,7 @@ self.assertNotEqual(access, access2) def test_legacy(self): - # create a new module + # create a new module XXX could rewrite using self.pkgdir newpackage = os.path.join(self.pkgdir, 'spam') os.mkdir(newpackage) with open(os.path.join(newpackage, '__init__.py'), 'w'): @@ -220,10 +220,12 @@ self.assertTrue(os.path.exists(imp.cache_from_source(sourcefile))) def test_quiet(self): - noise = subprocess.getoutput('{} -m compileall {}'.format( - sys.executable, self.pkgdir)) - quiet = subprocess.getoutput(('{} -m compileall -f -q {}'.format( - sys.executable, self.pkgdir))) + noise = subprocess.check_output( + [sys.executable, '-m', 'compileall', self.pkgdir], + stderr=subprocess.STDOUT) + quiet = subprocess.check_output( + [sys.executable, '-m', 'compileall', '-f', '-q', self.pkgdir], + stderr=subprocess.STDOUT) self.assertGreater(len(noise), len(quiet)) def test_regexp(self):

1 0

r86757 - python/branches/py3k-stat-on-windows-v2
by hirokazu.yamamoto Nov. 26, 2010

Nov. 26, 2010

Author: hirokazu.yamamoto Date: Fri Nov 26 01:23:25 2010 New Revision: 86757 Log: Try to implement os._osfstat to take windows handle. Added: python/branches/py3k-stat-on-windows-v2/ - copied from r86756, /python/branches/py3k/

1 0

r86756 - python/branches/py3k-cdecimal/setup.py
by stefan.krah Nov. 25, 2010

Nov. 25, 2010

Author: stefan.krah Date: Fri Nov 26 00:34:51 2010 New Revision: 86756 Log: OpenIndiana: problems with global constant in inline asm. Modified: python/branches/py3k-cdecimal/setup.py Modified: python/branches/py3k-cdecimal/setup.py ============================================================================== --- python/branches/py3k-cdecimal/setup.py (original) +++ python/branches/py3k-cdecimal/setup.py Fri Nov 26 00:34:51 2010 @@ -1790,8 +1790,9 @@ define_macros = [('CONFIG_64', '1'), ('ANSI', '1')] elif sizeof_size_t == 4: ppro = sysconfig.get_config_var('HAVE_GCC_ASM_FOR_X87') - if ppro and ('gcc' in cc or 'clang' in cc): - # darwin: problems with global constant in inline asm. + if ppro and ('gcc' in cc or 'clang' in cc) and \ + not 'sunos' in platform: + # darwin, solaris: problems with global constant in inline asm. # icc >= 11.0 works as well. define_macros = [('CONFIG_32', '1'), ('PPRO', '1'), ('ASM', '1')]

1 0

r86755 - tracker/instances/python-dev/scripts/suggest.py
by martin.v.loewis Nov. 25, 2010

Nov. 25, 2010

Author: martin.v.loewis Date: Thu Nov 25 21:53:40 2010 New Revision: 86755 Log: Fall back to simplejson. Mark executable. Modified: tracker/instances/python-dev/scripts/suggest.py (contents, props changed) Modified: tracker/instances/python-dev/scripts/suggest.py ============================================================================== --- tracker/instances/python-dev/scripts/suggest.py (original) +++ tracker/instances/python-dev/scripts/suggest.py Thu Nov 25 21:53:40 2010 @@ -1,6 +1,11 @@ #!/usr/bin/python # WSGI server to implement search suggestions -import ConfigParser, psycopg2, os, urllib, json +import ConfigParser, psycopg2, os, urllib + +try: + import json +except ImportError: + import simplejson as json # copied from indexer_common STOPWORDS = set([

1 0