Mailman 3 March 2009 - Python-checkins

r70094 - in python/trunk/Lib/distutils: command/bdist_rpm.py tests/test_bdist_rpm.py
by tarek.ziade March 2, 2009

March 2, 2009

Author: tarek.ziade Date: Mon Mar 2 06:38:44 2009 New Revision: 70094 Log: removing the force-optimized option as discussed in #1533164 Modified: python/trunk/Lib/distutils/command/bdist_rpm.py python/trunk/Lib/distutils/tests/test_bdist_rpm.py Modified: python/trunk/Lib/distutils/command/bdist_rpm.py ============================================================================== --- python/trunk/Lib/distutils/command/bdist_rpm.py (original) +++ python/trunk/Lib/distutils/command/bdist_rpm.py Mon Mar 2 06:38:44 2009 @@ -126,18 +126,10 @@ ('quiet', 'q', "Run the INSTALL phase of RPM building in quiet mode"), - - # Forces the -O1 option when calling the install command, - # so the rpm contains all files needed for proper operation under - # SELinux. Some systems checks for this on build-time and will - # fail without this. - ('force-optimize', None, - "Forces the -O1 option when calling the install command"), - ] boolean_options = ['keep-temp', 'use-rpm-opt-flags', 'rpm3-mode', - 'no-autoreq', 'quiet', 'force-optimize'] + 'no-autoreq', 'quiet'] negative_opt = {'no-keep-temp': 'keep-temp', 'no-rpm-opt-flags': 'use-rpm-opt-flags', @@ -188,7 +180,6 @@ self.force_arch = None self.quiet = 0 - self.force_optimize = 1 # initialize_options() @@ -504,14 +495,8 @@ # that we open and interpolate into the spec file, but the defaults # are just text that we drop in as-is. Hmmm. - # forcing -O1 if force-optimize - if self.force_optimize: - optimize = ' -O1' - else: - optimize = '' - - install_cmd = ('%s install%s --root=$RPM_BUILD_ROOT ' - '--record=INSTALLED_FILES') % (def_setup_call, optimize) + install_cmd = ('%s install -O1 --root=$RPM_BUILD_ROOT ' + '--record=INSTALLED_FILES') % def_setup_call script_options = [ ('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"), Modified: python/trunk/Lib/distutils/tests/test_bdist_rpm.py ============================================================================== --- python/trunk/Lib/distutils/tests/test_bdist_rpm.py (original) +++ python/trunk/Lib/distutils/tests/test_bdist_rpm.py Mon Mar 2 06:38:44 2009 @@ -109,8 +109,6 @@ cmd = bdist_rpm(dist) cmd.fix_python = True - # running with force-optimize = 1 - # and quiet = 1 cmd.quiet = 1 cmd.ensure_finalized() cmd.run() @@ -119,29 +117,6 @@ self.assert_('foo-0.1-1.noarch.rpm' in dist_created) os.remove(os.path.join(pkg_dir, 'dist', 'foo-0.1-1.noarch.rpm')) - # XXX I am unable yet to make this test work without - # spurious stderr output - # so returning until distutils.spawn acts better - return - - # running with force-optimize = 0 - cmd.force_optimize = 0 - try: - # XXX How to prevent the spawned - # rpmbuild command to display errors ? - # this can be a problem for buildbots - cmd.ensure_finalized() - cmd.run() - except DistutilsExecError: - # happens only under Fedora/RedHat - # and some flavors of Linux - # otherwise it's a bug - if sys.platform == 'linux2': - return - - dist_created = os.listdir(os.path.join(pkg_dir, 'dist')) - self.assert_('foo-0.1-1.noarch.rpm' in dist_created) - def test_suite(): return unittest.makeSuite(BuildRpmTestCase)

1 0

r70093 - in python/branches/release30-maint: Doc/library/re.rst
by gregory.p.smith March 2, 2009

March 2, 2009

Author: gregory.p.smith Date: Mon Mar 2 06:35:45 2009 New Revision: 70093 Log: Merged revisions 70089 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r70089 | gregory.p.smith | 2009-03-01 21:04:04 -0800 (Sun, 01 Mar 2009) | 2 lines Merged r70088 from trunk (re documentation update) ........ Modified: python/branches/release30-maint/ (props changed) python/branches/release30-maint/Doc/library/re.rst Modified: python/branches/release30-maint/Doc/library/re.rst ============================================================================== --- python/branches/release30-maint/Doc/library/re.rst (original) +++ python/branches/release30-maint/Doc/library/re.rst Mon Mar 2 06:35:45 2009 @@ -460,19 +460,23 @@ The sequence :: - prog = re.compile(pat) - result = prog.match(str) + prog = re.compile(pattern) + result = prog.match(string) is equivalent to :: - result = re.match(pat, str) + result = re.match(pattern, string) - but the version using :func:`compile` is more efficient when the expression - will be used several times in a single program. + but using :func:`compile` and saving the resulting regular expression object + for reuse is more efficient when the expression will be used several times + in a single program. - .. (The compiled version of the last pattern passed to :func:`re.match` or - :func:`re.search` is cached, so programs that use only a single regular - expression at a time needn't worry about compiling regular expressions.) + .. note:: + + The compiled versions of the most recent patterns passed to + :func:`re.match`, :func:`re.search` or :func:`re.compile` are cached, so + programs that use only a few regular expressions at a time needn't worry + about compiling regular expressions. .. data:: A

1 0

r70092 - in python/branches/release26-maint: Doc/library/re.rst
by gregory.p.smith March 2, 2009

March 2, 2009

Author: gregory.p.smith Date: Mon Mar 2 06:25:11 2009 New Revision: 70092 Log: Merged revisions 70088 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r70088 | gregory.p.smith | 2009-03-01 20:53:24 -0800 (Sun, 01 Mar 2009) | 4 lines The note about caching of regular expression objects was incorrect ReST and thus invisible in the compiled documentation. Fixed. Also I cleaned up the wording. ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Doc/library/re.rst Modified: python/branches/release26-maint/Doc/library/re.rst ============================================================================== --- python/branches/release26-maint/Doc/library/re.rst (original) +++ python/branches/release26-maint/Doc/library/re.rst Mon Mar 2 06:25:11 2009 @@ -440,19 +440,23 @@ The sequence :: - prog = re.compile(pat) - result = prog.match(str) + prog = re.compile(pattern) + result = prog.match(string) is equivalent to :: - result = re.match(pat, str) + result = re.match(pattern, string) - but the version using :func:`compile` is more efficient when the expression - will be used several times in a single program. + but using :func:`compile` and saving the resulting regular expression object + for reuse is more efficient when the expression will be used several times + in a single program. - .. (The compiled version of the last pattern passed to :func:`re.match` or - :func:`re.search` is cached, so programs that use only a single regular - expression at a time needn't worry about compiling regular expressions.) + .. note:: + + The compiled versions of the most recent patterns passed to + :func:`re.match`, :func:`re.search` or :func:`re.compile` are cached, so + programs that use only a few regular expressions at a time needn't worry + about compiling regular expressions. .. data:: I

1 0

r70091 - in python/branches/py3k: Doc/library/re.rst Lib/re.py Misc/NEWS
by gregory.p.smith March 2, 2009

March 2, 2009

Author: gregory.p.smith Date: Mon Mar 2 06:21:55 2009 New Revision: 70091 Log: Merged revisions 70090 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r70090 | gregory.p.smith | 2009-03-01 21:13:57 -0800 (Sun, 01 Mar 2009) | 3 lines Adds an optional flags argument to re.split, re.sub and re.subn to be consistent with the other re module functions. ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/library/re.rst python/branches/py3k/Lib/re.py python/branches/py3k/Misc/NEWS Modified: python/branches/py3k/Doc/library/re.rst ============================================================================== --- python/branches/py3k/Doc/library/re.rst (original) +++ python/branches/py3k/Doc/library/re.rst Mon Mar 2 06:21:55 2009 @@ -571,7 +571,7 @@ instead. -.. function:: split(pattern, string[, maxsplit=0]) +.. function:: split(pattern, string[, maxsplit=0, flags=0]) Split *string* by the occurrences of *pattern*. If capturing parentheses are used in *pattern*, then the text of all groups in the pattern are also returned @@ -585,6 +585,8 @@ ['Words', ', ', 'words', ', ', 'words', '.', ''] >>> re.split('\W+', 'Words, words, words.', 1) ['Words', 'words, words.'] + >>> re.split('[a-f]+', '0a3B9', flags=re.IGNORECASE) + ['0', '3', '9'] If there are capturing groups in the separator and it matches at the start of the string, the result will start with an empty string. The same holds for @@ -605,6 +607,9 @@ >>> re.split("(?m)^$", "foo\n\nbar\n") ['foo\n\nbar\n'] + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + .. function:: findall(pattern, string[, flags]) @@ -625,7 +630,7 @@ match. -.. function:: sub(pattern, repl, string[, count]) +.. function:: sub(pattern, repl, string[, count, flags]) Return the string obtained by replacing the leftmost non-overlapping occurrences of *pattern* in *string* by the replacement *repl*. If the pattern isn't found, @@ -650,6 +655,8 @@ ... else: return '-' >>> re.sub('-{1,2}', dashrepl, 'pro----gram-files') 'pro--gram files' + >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE) + 'Baked Beans & Spam' The pattern may be a string or an RE object; if you need to specify regular expression flags, you must use a RE object, or use embedded modifiers in a @@ -670,12 +677,18 @@ character ``'0'``. The backreference ``\g<0>`` substitutes in the entire substring matched by the RE. + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + -.. function:: subn(pattern, repl, string[, count]) +.. function:: subn(pattern, repl, string[, count, flags]) Perform the same operation as :func:`sub`, but return a tuple ``(new_string, number_of_subs_made)``. + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + .. function:: escape(string) Modified: python/branches/py3k/Lib/re.py ============================================================================== --- python/branches/py3k/Lib/re.py (original) +++ python/branches/py3k/Lib/re.py Mon Mar 2 06:21:55 2009 @@ -156,16 +156,16 @@ a match object, or None if no match was found.""" return _compile(pattern, flags).search(string) -def sub(pattern, repl, string, count=0): +def sub(pattern, repl, string, count=0, flags=0): """Return the string obtained by replacing the leftmost non-overlapping occurrences of the pattern in string by the replacement repl. repl can be either a string or a callable; if a string, backslash escapes in it are processed. If it is a callable, it's passed the match object and must return a replacement string to be used.""" - return _compile(pattern, 0).sub(repl, string, count) + return _compile(pattern, flags).sub(repl, string, count) -def subn(pattern, repl, string, count=0): +def subn(pattern, repl, string, count=0, flags=0): """Return a 2-tuple containing (new_string, number). new_string is the string obtained by replacing the leftmost non-overlapping occurrences of the pattern in the source @@ -174,12 +174,12 @@ callable; if a string, backslash escapes in it are processed. If it is a callable, it's passed the match object and must return a replacement string to be used.""" - return _compile(pattern, 0).subn(repl, string, count) + return _compile(pattern, flags).subn(repl, string, count) -def split(pattern, string, maxsplit=0): +def split(pattern, string, maxsplit=0, flags=0): """Split the source string by the occurrences of the pattern, returning a list containing the resulting substrings.""" - return _compile(pattern, 0).split(string, maxsplit) + return _compile(pattern, flags).split(string, maxsplit) def findall(pattern, string, flags=0): """Return a list of all non-overlapping matches in the string. Modified: python/branches/py3k/Misc/NEWS ============================================================================== --- python/branches/py3k/Misc/NEWS (original) +++ python/branches/py3k/Misc/NEWS Mon Mar 2 06:21:55 2009 @@ -170,6 +170,8 @@ - Issue #4748: Lambda generators no longer return a value. +- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. + Library -------

1 0

buildbot failure in x86 gentoo 3.x
by buildbot＠python.org March 2, 2009

March 2, 2009

The Buildbot has detected a new failure of x86 gentoo 3.x. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20gentoo%203.x/builds/443 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: norwitz-x86 Build Reason: Build Source Stamp: [branch branches/py3k] HEAD Blamelist: gregory.p.smith,raymond.hettinger BUILD FAILED: failed test Excerpt from the test logfile: make: *** [buildbottest] Unknown signal 32 sincerely, -The Buildbot

1 0

r70090 - in python/trunk: Doc/library/re.rst Lib/re.py Misc/NEWS
by gregory.p.smith March 2, 2009

March 2, 2009

Author: gregory.p.smith Date: Mon Mar 2 06:13:57 2009 New Revision: 70090 Log: Adds an optional flags argument to re.split, re.sub and re.subn to be consistent with the other re module functions. Modified: python/trunk/Doc/library/re.rst python/trunk/Lib/re.py python/trunk/Misc/NEWS Modified: python/trunk/Doc/library/re.rst ============================================================================== --- python/trunk/Doc/library/re.rst (original) +++ python/trunk/Doc/library/re.rst Mon Mar 2 06:13:57 2009 @@ -540,7 +540,7 @@ instead. -.. function:: split(pattern, string[, maxsplit=0]) +.. function:: split(pattern, string[, maxsplit=0, flags=0]) Split *string* by the occurrences of *pattern*. If capturing parentheses are used in *pattern*, then the text of all groups in the pattern are also returned @@ -555,6 +555,8 @@ ['Words', ', ', 'words', ', ', 'words', '.', ''] >>> re.split('\W+', 'Words, words, words.', 1) ['Words', 'words, words.'] + >>> re.split('[a-f]+', '0a3B9', flags=re.IGNORECASE) + ['0', '3', '9'] If there are capturing groups in the separator and it matches at the start of the string, the result will start with an empty string. The same holds for @@ -575,6 +577,9 @@ >>> re.split("(?m)^$", "foo\n\nbar\n") ['foo\n\nbar\n'] + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + .. function:: findall(pattern, string[, flags]) @@ -605,7 +610,7 @@ Added the optional flags argument. -.. function:: sub(pattern, repl, string[, count]) +.. function:: sub(pattern, repl, string[, count, flags]) Return the string obtained by replacing the leftmost non-overlapping occurrences of *pattern* in *string* by the replacement *repl*. If the pattern isn't found, @@ -630,6 +635,8 @@ ... else: return '-' >>> re.sub('-{1,2}', dashrepl, 'pro----gram-files') 'pro--gram files' + >>> re.sub(r'\sAND\s', ' & ', 'Baked Beans And Spam', flags=re.IGNORECASE) + 'Baked Beans & Spam' The pattern may be a string or an RE object; if you need to specify regular expression flags, you must use a RE object, or use embedded modifiers in a @@ -650,12 +657,18 @@ character ``'0'``. The backreference ``\g<0>`` substitutes in the entire substring matched by the RE. + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + -.. function:: subn(pattern, repl, string[, count]) +.. function:: subn(pattern, repl, string[, count, flags]) Perform the same operation as :func:`sub`, but return a tuple ``(new_string, number_of_subs_made)``. + .. versionchanged:: 2.7,3.1 + Added the optional flags argument. + .. function:: escape(string) Modified: python/trunk/Lib/re.py ============================================================================== --- python/trunk/Lib/re.py (original) +++ python/trunk/Lib/re.py Mon Mar 2 06:13:57 2009 @@ -141,16 +141,16 @@ a match object, or None if no match was found.""" return _compile(pattern, flags).search(string) -def sub(pattern, repl, string, count=0): +def sub(pattern, repl, string, count=0, flags=0): """Return the string obtained by replacing the leftmost non-overlapping occurrences of the pattern in string by the replacement repl. repl can be either a string or a callable; if a string, backslash escapes in it are processed. If it is a callable, it's passed the match object and must return a replacement string to be used.""" - return _compile(pattern, 0).sub(repl, string, count) + return _compile(pattern, flags).sub(repl, string, count) -def subn(pattern, repl, string, count=0): +def subn(pattern, repl, string, count=0, flags=0): """Return a 2-tuple containing (new_string, number). new_string is the string obtained by replacing the leftmost non-overlapping occurrences of the pattern in the source @@ -159,12 +159,12 @@ callable; if a string, backslash escapes in it are processed. If it is a callable, it's passed the match object and must return a replacement string to be used.""" - return _compile(pattern, 0).subn(repl, string, count) + return _compile(pattern, flags).subn(repl, string, count) -def split(pattern, string, maxsplit=0): +def split(pattern, string, maxsplit=0, flags=0): """Split the source string by the occurrences of the pattern, returning a list containing the resulting substrings.""" - return _compile(pattern, 0).split(string, maxsplit) + return _compile(pattern, flags).split(string, maxsplit) def findall(pattern, string, flags=0): """Return a list of all non-overlapping matches in the string. Modified: python/trunk/Misc/NEWS ============================================================================== --- python/trunk/Misc/NEWS (original) +++ python/trunk/Misc/NEWS Mon Mar 2 06:13:57 2009 @@ -163,6 +163,8 @@ - Issue #3582: Use native TLS functions on Windows +- The re.sub(), re.subn() and re.split() functions now accept a flags parameter. + Library -------

1 0

r70089 - in python/branches/py3k: Doc/library/re.rst
by gregory.p.smith March 2, 2009

March 2, 2009

Author: gregory.p.smith Date: Mon Mar 2 06:04:04 2009 New Revision: 70089 Log: Merged r70088 from trunk (re documentation update) Modified: python/branches/py3k/ (props changed) python/branches/py3k/Doc/library/re.rst Modified: python/branches/py3k/Doc/library/re.rst ============================================================================== --- python/branches/py3k/Doc/library/re.rst (original) +++ python/branches/py3k/Doc/library/re.rst Mon Mar 2 06:04:04 2009 @@ -460,19 +460,23 @@ The sequence :: - prog = re.compile(pat) - result = prog.match(str) + prog = re.compile(pattern) + result = prog.match(string) is equivalent to :: - result = re.match(pat, str) + result = re.match(pattern, string) - but the version using :func:`compile` is more efficient when the expression - will be used several times in a single program. + but using :func:`compile` and saving the resulting regular expression object + for reuse is more efficient when the expression will be used several times + in a single program. - .. (The compiled version of the last pattern passed to :func:`re.match` or - :func:`re.search` is cached, so programs that use only a single regular - expression at a time needn't worry about compiling regular expressions.) + .. note:: + + The compiled versions of the most recent patterns passed to + :func:`re.match`, :func:`re.search` or :func:`re.compile` are cached, so + programs that use only a few regular expressions at a time needn't worry + about compiling regular expressions. .. data:: A

1 0

r70088 - python/trunk/Doc/library/re.rst
by gregory.p.smith March 1, 2009

March 1, 2009

Author: gregory.p.smith Date: Mon Mar 2 05:53:24 2009 New Revision: 70088 Log: The note about caching of regular expression objects was incorrect ReST and thus invisible in the compiled documentation. Fixed. Also I cleaned up the wording. Modified: python/trunk/Doc/library/re.rst Modified: python/trunk/Doc/library/re.rst ============================================================================== --- python/trunk/Doc/library/re.rst (original) +++ python/trunk/Doc/library/re.rst Mon Mar 2 05:53:24 2009 @@ -440,19 +440,23 @@ The sequence :: - prog = re.compile(pat) - result = prog.match(str) + prog = re.compile(pattern) + result = prog.match(string) is equivalent to :: - result = re.match(pat, str) + result = re.match(pattern, string) - but the version using :func:`compile` is more efficient when the expression - will be used several times in a single program. + but using :func:`compile` and saving the resulting regular expression object + for reuse is more efficient when the expression will be used several times + in a single program. - .. (The compiled version of the last pattern passed to :func:`re.match` or - :func:`re.search` is cached, so programs that use only a single regular - expression at a time needn't worry about compiling regular expressions.) + .. note:: + + The compiled versions of the most recent patterns passed to + :func:`re.match`, :func:`re.search` or :func:`re.compile` are cached, so + programs that use only a few regular expressions at a time needn't worry + about compiling regular expressions. .. data:: I

1 0

buildbot failure in x86 osx.5 trunk
by buildbot＠python.org March 1, 2009

March 1, 2009

The Buildbot has detected a new failure of x86 osx.5 trunk. Full details are available at: http://www.python.org/dev/buildbot/all/x86%20osx.5%20trunk/builds/695 Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: heller-x86-osx5 Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: benjamin.peterson,raymond.hettinger BUILD FAILED: failed test Excerpt from the test logfile: sincerely, -The Buildbot

1 0

buildbot failure in ppc Debian unstable trunk
by buildbot＠python.org March 1, 2009

March 1, 2009

The Buildbot has detected a new failure of ppc Debian unstable trunk. Full details are available at: http://www.python.org/dev/buildbot/all/ppc%20Debian%20unstable%20trunk/buil… Buildbot URL: http://www.python.org/dev/buildbot/all/ Buildslave for this Build: klose-debian-ppc Build Reason: Build Source Stamp: [branch trunk] HEAD Blamelist: benjamin.peterson,raymond.hettinger BUILD FAILED: failed test Excerpt from the test logfile: 1 test failed: test_bsddb3 ====================================================================== FAIL: test01_basic_replication (bsddb.test.test_replication.DBReplicationManager) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pybot/buildarea/trunk.klose-debian-ppc/build/Lib/bsddb/test/test_replication.py", line 134, in test01_basic_replication self.assertTrue(time.time()<timeout) AssertionError: None make: *** [buildbottest] Error 1 sincerely, -The Buildbot

1 0