Mailman 3 August 2007 - Python-checkins

buildbot warnings in x86 XP 2.5
by buildbot＠python.org Aug. 31, 2007

Aug. 31, 2007

The Buildbot has detected a new failure of x86 XP 2.5. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20XP%202.5/builds/278 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch branches/release25-maint] HEAD Blamelist: lars.gustaebel,martin.v.loewis Build had warnings: warnings failed slave lost sincerely, -The Buildbot

1 0

buildbot warnings in amd64 gentoo trunk
by buildbot＠python.org Aug. 31, 2007

Aug. 31, 2007

The Buildbot has detected a new failure of amd64 gentoo trunk. Full details are available at: http://www.python.org/dev/buildbot/all/amd64%20gentoo%20trunk/builds/2223 Buildbot URL: http://www.python.org/dev/buildbot/all/ Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: georg.brandl,martin.v.loewis Build had warnings: warnings test Excerpt from the test logfile: Traceback (most recent call last): File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 281, in readerThread rec = dbutils.DeadlockWrap(c.next, max_retries=10) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/dbutils.py", line 62, in DeadlockWrap return function(*_args, **_kwargs) DBLockDeadlockError: (-30995, 'DB_LOCK_DEADLOCK: Locker killed to resolve a deadlock') Traceback (most recent call last): File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 281, in readerThread rec = dbutils.DeadlockWrap(c.next, max_retries=10) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/dbutils.py", line 62, in DeadlockWrap return function(*_args, **_kwargs) DBLockDeadlockError: (-30995, 'DB_LOCK_DEADLOCK: Locker killed to resolve a deadlock') Traceback (most recent call last): File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 260, in writerThread self.assertEqual(data, self.makeData(key)) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/unittest.py", line 343, in failUnlessEqual (msg or '%r != %r' % (first, second)) AssertionError: None != '1000-1000-1000-1000-1000' Traceback (most recent call last): File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 260, in writerThread self.assertEqual(data, self.makeData(key)) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/unittest.py", line 343, in failUnlessEqual (msg or '%r != %r' % (first, second)) AssertionError: None != '2000-2000-2000-2000-2000' Traceback (most recent call last): File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 486, in __bootstrap_inner self.run() File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/threading.py", line 446, in run self.__target(*self.__args, **self.__kwargs) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/bsddb/test/test_thread.py", line 260, in writerThread self.assertEqual(data, self.makeData(key)) File "/home/buildbot/slave/py-build/trunk.norwitz-amd64/build/Lib/unittest.py", line 343, in failUnlessEqual (msg or '%r != %r' % (first, second)) AssertionError: None != '0002-0002-0002-0002-0002' 1 test failed: test_urllib2net make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0

r57833 - python/trunk/Tools/msi/msi.py
by martin.v.loewis Aug. 31, 2007

Aug. 31, 2007

Author: martin.v.loewis Date: Fri Aug 31 12:01:07 2007 New Revision: 57833 Modified: python/trunk/Tools/msi/msi.py Log: Mark registry components as 64-bit on Win64. Modified: python/trunk/Tools/msi/msi.py ============================================================================== --- python/trunk/Tools/msi/msi.py (original) +++ python/trunk/Tools/msi/msi.py Fri Aug 31 12:01:07 2007 @@ -168,8 +168,10 @@ if msilib.Win64: SystemFolderName = "[System64Folder]" + registry_component = 4|256 else: SystemFolderName = "[SystemFolder]" + registry_component = 4 msilib.reset() @@ -1062,15 +1064,15 @@ tcldata = [] if have_tcl: tcldata = [ - ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, None, + ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "py.IDLE")] add_data(db, "Component", # msidbComponentAttributesRegistryKeyPath = 4 - [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None, + [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "InstallPath"), - ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", 4, None, + ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "Documentation"), - ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", 4, + ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", registry_component, None, None)] + tcldata) # See "FeatureComponents Table". # The association between TclTk and pythonw.exe is necessary to make ICE59

1 0

r57832 - python/branches/release25-maint/Tools/msi/msi.py
by martin.v.loewis Aug. 31, 2007

Aug. 31, 2007

Author: martin.v.loewis Date: Fri Aug 31 12:00:06 2007 New Revision: 57832 Modified: python/branches/release25-maint/Tools/msi/msi.py Log: Mark registry components as 64-bit on Win64. Modified: python/branches/release25-maint/Tools/msi/msi.py ============================================================================== --- python/branches/release25-maint/Tools/msi/msi.py (original) +++ python/branches/release25-maint/Tools/msi/msi.py Fri Aug 31 12:00:06 2007 @@ -167,8 +167,10 @@ if msilib.Win64: SystemFolderName = "[System64Folder]" + registry_component = 4|256 else: SystemFolderName = "[SystemFolder]" + registry_component = 4 msilib.reset() @@ -1061,15 +1063,15 @@ tcldata = [] if have_tcl: tcldata = [ - ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", 4, None, + ("REGISTRY.tcl", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "py.IDLE")] add_data(db, "Component", # msidbComponentAttributesRegistryKeyPath = 4 - [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", 4, None, + [("REGISTRY", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "InstallPath"), - ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", 4, None, + ("REGISTRY.doc", msilib.gen_uuid(), "TARGETDIR", registry_component, None, "Documentation"), - ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", 4, + ("REGISTRY.def", msilib.gen_uuid(), "TARGETDIR", registry_component, None, None)] + tcldata) # See "FeatureComponents Table". # The association between TclTk and pythonw.exe is necessary to make ICE59

1 0

r57827 - python/trunk/Doc/documenting/markup.rst
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 10:47:51 2007 New Revision: 57827 Modified: python/trunk/Doc/documenting/markup.rst Log: Fix subitem markup. Modified: python/trunk/Doc/documenting/markup.rst ============================================================================== --- python/trunk/Doc/documenting/markup.rst (original) +++ python/trunk/Doc/documenting/markup.rst Fri Aug 31 10:47:51 2007 @@ -707,7 +707,7 @@ For example:: .. index:: - single: execution!context + single: execution; context module: __main__ module: sys triple: module; search; path @@ -720,18 +720,18 @@ single Creates a single index entry. Can be made a subentry by separating the - subentry text with a semicolon (this is also used below to describe what - entries are created). + subentry text with a semicolon (this notation is also used below to describe + what entries are created). pair ``pair: loop; statement`` is a shortcut that creates two index entries, - namely ``loop!statement`` and ``statement!loop``. + namely ``loop; statement`` and ``statement; loop``. triple Likewise, ``triple: module; search; path`` is a shortcut that creates three - index entries, which are ``module!search path``, ``search!path, module`` and - ``path!module search``. + index entries, which are ``module; search path``, ``search; path, module`` and + ``path; module search``. module, keyword, operator, object, exception, statement, builtin These all create two index entries. For example, ``module: hashlib`` creates - the entries ``module!hashlib`` and ``hashlib!module``. + the entries ``module; hashlib`` and ``hashlib; module``. For index directives containing only "single" entries, there is a shorthand notation::

1 0

r57826 - doctools/trunk/sphinx/environment.py
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 10:47:16 2007 New Revision: 57826 Modified: doctools/trunk/sphinx/environment.py Log: Fix index subitem generation. Modified: doctools/trunk/sphinx/environment.py ============================================================================== --- doctools/trunk/sphinx/environment.py (original) +++ doctools/trunk/sphinx/environment.py Fri Aug 31 10:47:16 2007 @@ -683,8 +683,8 @@ # new entry types must be listed in directives.py! for type, string, tid, alias in entries: if type == 'single': - entry, _, subentry = string.partition('!') - add_entry(entry, subentry) + entry, _, subentry = string.partition(';') + add_entry(entry.strip(), subentry.strip()) elif type == 'pair': first, second = map(lambda x: x.strip(), string.split(';', 1)) add_entry(first, second) @@ -694,14 +694,6 @@ add_entry(first, second+' '+third) add_entry(second, third+', '+first) add_entry(third, first+' '+second) -# this is a bit ridiculous... -# elif type == 'quadruple': -# first, second, third, fourth = \ -# map(lambda x: x.strip(), string.split(';', 3)) -# add_entry(first, '%s %s %s' % (second, third, fourth)) -# add_entry(second, '%s %s, %s' % (third, fourth, first)) -# add_entry(third, '%s, %s %s' % (fourth, first, second)) -# add_entry(fourth, '%s %s %s' % (first, second, third)) elif type in ('module', 'keyword', 'operator', 'object', 'exception', 'statement'): add_entry(string, type)

1 0

r57825 - sandbox/trunk/2to3/README
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 10:14:05 2007 New Revision: 57825 Modified: sandbox/trunk/2to3/README Log: Add a short statement on general usage to README. Modified: sandbox/trunk/2to3/README ============================================================================== --- sandbox/trunk/2to3/README (original) +++ sandbox/trunk/2to3/README Fri Aug 31 10:14:05 2007 @@ -6,11 +6,23 @@ This is a work in progress! +General usage +============= + +Run ``refactor.py`` to convert stdin (``-``), files or directories given +as arguments. By default, the tool outputs a unified diff-formatted patch +on standard output and a "what was changed" summary on standard error, +but the ``-w`` option can be given to write back converted files, creating +``.bak``-named backup files. + +2to3 must be run (at the moment) with Python 2.x! + + Files ===== README - this file -refactor.py - main program; use this to +refactor.py - main program; use this to convert files or directory trees test.py - runs all unittests for 2to3 patcomp.py - pattern compiler pytree.py - parse tree nodes (not specific to Python, despite the name!)

1 0

r57821 - doctools/trunk/sphinx/directives.py
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 09:00:44 2007 New Revision: 57821 Modified: doctools/trunk/sphinx/directives.py Log: No "quadruple" entries anymore. Modified: doctools/trunk/sphinx/directives.py ============================================================================== --- doctools/trunk/sphinx/directives.py (original) +++ doctools/trunk/sphinx/directives.py Fri Aug 31 09:00:44 2007 @@ -23,8 +23,8 @@ # ------ index markup -------------------------------------------------------------- entrytypes = [ - 'single', 'pair', 'triple', 'quadruple', - 'module', 'keyword', 'operator', 'object', 'exception', 'statement', 'builtin', + 'single', 'pair', 'triple', 'module', 'keyword', 'operator', + 'object', 'exception', 'statement', 'builtin', ] def index_directive(name, arguments, options, content, lineno,

1 0

r57820 - python/trunk/Doc/documenting/markup.rst
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 08:59:27 2007 New Revision: 57820 Modified: python/trunk/Doc/documenting/markup.rst Log: Document new shorthand notation for index entries. Modified: python/trunk/Doc/documenting/markup.rst ============================================================================== --- python/trunk/Doc/documenting/markup.rst (original) +++ python/trunk/Doc/documenting/markup.rst Fri Aug 31 08:59:27 2007 @@ -724,14 +724,21 @@ entries are created). pair ``pair: loop; statement`` is a shortcut that creates two index entries, - namely ``loop; statement`` and ``statement; loop``. + namely ``loop!statement`` and ``statement!loop``. triple Likewise, ``triple: module; search; path`` is a shortcut that creates three - index entries, which are ``module; search path``, ``search; path, module`` and - ``path; module search``. + index entries, which are ``module!search path``, ``search!path, module`` and + ``path!module search``. module, keyword, operator, object, exception, statement, builtin These all create two index entries. For example, ``module: hashlib`` creates - the entries ``module; hashlib`` and ``hashlib; module``. + the entries ``module!hashlib`` and ``hashlib!module``. + +For index directives containing only "single" entries, there is a shorthand +notation:: + + .. index:: BNF, grammar, syntax, notation + +This creates four index entries. Grammar production displays

1 0

r57819 - doctools/trunk/sphinx/directives.py
by georg.brandl Aug. 31, 2007

Aug. 31, 2007

Author: georg.brandl Date: Fri Aug 31 08:56:18 2007 New Revision: 57819 Modified: doctools/trunk/sphinx/directives.py Log: Add a shorthand notation for single index entries. Modified: doctools/trunk/sphinx/directives.py ============================================================================== --- doctools/trunk/sphinx/directives.py (original) +++ doctools/trunk/sphinx/directives.py Fri Aug 31 08:56:18 2007 @@ -38,12 +38,16 @@ indexnode = addnodes.index() indexnode['entries'] = arguments for entry in arguments: - try: - type, string = entry.split(':', 1) - env.note_index_entry(type.strip(), string.strip(), - targetid, string.strip()) - except ValueError: - continue + entry = entry.strip() + for type in entrytypes: + if entry.startswith(type+':'): + value = entry[len(type)+1:].strip() + env.note_index_entry(type, value, targetid, value) + break + # shorthand notation for single entries + else: + for value in entry.split(','): + env.note_index_entry('single', value.strip(), targetid, value.strip()) return [indexnode, targetnode] index_directive.arguments = (1, 0, 1)

1 0