Mailman 3 July 2011 - Python-checkins

cpython (3.2): Issue #12644: document the '%a' conversion in the old string formatting
by eli.bendersky July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/9846f6463f23 changeset: 71544:9846f6463f23 branch: 3.2 parent: 71540:3e26c9033306 user: Eli Bendersky <eliben(a)gmail.com> date: Fri Jul 29 09:30:42 2011 +0300 summary: Issue #12644: document the '%a' conversion in the old string formatting operations. Patch prepared together with Ezio Melotti files: Doc/library/stdtypes.rst | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Doc/library/stdtypes.rst b/Doc/library/stdtypes.rst --- a/Doc/library/stdtypes.rst +++ b/Doc/library/stdtypes.rst @@ -1464,7 +1464,7 @@ object to convert comes after the minimum field width and optional precision. #. Precision (optional), given as a ``'.'`` (dot) followed by the precision. If - specified as ``'*'`` (an asterisk), the actual width is read from the next + specified as ``'*'`` (an asterisk), the actual precision is read from the next element of the tuple in *values*, and the value to convert comes after the precision. @@ -1546,9 +1546,12 @@ | ``'r'`` | String (converts any Python object using | \(5) | | | :func:`repr`). | | +------------+-----------------------------------------------------+-------+ -| ``'s'`` | String (converts any Python object using | | +| ``'s'`` | String (converts any Python object using | \(5) | | | :func:`str`). | | +------------+-----------------------------------------------------+-------+ +| ``'a'`` | String (converts any Python object using | \(5) | +| | :func:`ascii`). | | ++------------+-----------------------------------------------------+-------+ | ``'%'`` | No argument is converted, results in a ``'%'`` | | | | character in the result. | | +------------+-----------------------------------------------------+-------+ @@ -1581,7 +1584,7 @@ decimal point and defaults to 6. (5) - The precision determines the maximal number of characters used. + If precision is ``N``, the output is truncated to ``N`` characters. (7) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format.
by eli.bendersky July 29, 2011

July 29, 2011

http://hg.python.org/cpython/rev/536fccc75f5a changeset: 71543:536fccc75f5a user: Eli Bendersky <eliben(a)gmail.com> date: Fri Jul 29 07:05:08 2011 +0300 summary: Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. As a side effect, this now allows the rjust, ljust and center methods of bytes and bytearray to accept a bytearray argument. Patch by Petri Lehtinen files: Doc/c-api/arg.rst | 8 +++++--- Lib/test/test_bytes.py | 21 +++++++++++++++++++++ Lib/test/test_getargs2.py | 9 +++++++++ Misc/NEWS | 7 ++++++- Modules/_testcapimodule.c | 10 ++++++++++ Python/getargs.c | 2 ++ 6 files changed, 53 insertions(+), 4 deletions(-) diff --git a/Doc/c-api/arg.rst b/Doc/c-api/arg.rst --- a/Doc/c-api/arg.rst +++ b/Doc/c-api/arg.rst @@ -260,9 +260,11 @@ ``n`` (:class:`int`) [Py_ssize_t] Convert a Python integer to a C :c:type:`Py_ssize_t`. -``c`` (:class:`bytes` of length 1) [char] - Convert a Python byte, represented as a :class:`bytes` object of length 1, - to a C :c:type:`char`. +``c`` (:class:`bytes` or :class:`bytearray` of length 1) [char] + Convert a Python byte, represented as a :class:`bytes` or + :class:`bytearray` object of length 1, to a C :c:type:`char`. + + .. versionchanged:: 3.3 Allow :class:`bytearray` objects ``C`` (:class:`str` of length 1) [int] Convert a Python character, represented as a :class:`str` object of diff --git a/Lib/test/test_bytes.py b/Lib/test/test_bytes.py --- a/Lib/test/test_bytes.py +++ b/Lib/test/test_bytes.py @@ -475,6 +475,27 @@ self.assertRaises(TypeError, self.type2test(b'abc').lstrip, 'b') self.assertRaises(TypeError, self.type2test(b'abc').rstrip, 'b') + def test_center(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.center(7, fill_type(b'-')), + self.type2test(b'--abc--')) + + def test_ljust(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.ljust(7, fill_type(b'-')), + self.type2test(b'abc----')) + + def test_rjust(self): + # Fill character can be either bytes or bytearray (issue 12380) + b = self.type2test(b'abc') + for fill_type in (bytes, bytearray): + self.assertEqual(b.rjust(7, fill_type(b'-')), + self.type2test(b'----abc')) + def test_ord(self): b = self.type2test(b'\0A\x7f\x80\xff') self.assertEqual([ord(b[i:i+1]) for i in range(len(b))], diff --git a/Lib/test/test_getargs2.py b/Lib/test/test_getargs2.py --- a/Lib/test/test_getargs2.py +++ b/Lib/test/test_getargs2.py @@ -294,6 +294,15 @@ self.fail('TypeError should have been raised') class Bytes_TestCase(unittest.TestCase): + def test_c(self): + from _testcapi import getargs_c + self.assertRaises(TypeError, getargs_c, b'abc') # len > 1 + self.assertEqual(getargs_c(b'a'), b'a') + self.assertEqual(getargs_c(bytearray(b'a')), b'a') + self.assertRaises(TypeError, getargs_c, memoryview(b'a')) + self.assertRaises(TypeError, getargs_c, 's') + self.assertRaises(TypeError, getargs_c, None) + def test_s(self): from _testcapi import getargs_s self.assertEqual(getargs_s('abc\xe9'), b'abc\xc3\xa9') diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -238,6 +238,9 @@ - Issue #11386: bytearray.pop() now throws IndexError when the bytearray is empty, instead of OverflowError. +- Issue #12380: The rjust, ljust and center methods of bytes and bytearray + now accept a bytearray argument. + Library ------- @@ -1282,6 +1285,8 @@ - Issue #12173: The first argument of PyImport_ImportModuleLevel is now `const char *` instead of `char *`. +- Issue #12380: PyArg_ParseTuple now accepts a bytearray for the 'c' format. + Documentation ------------- @@ -6680,4 +6685,4 @@ ---- -**(For information about older versions, consult the HISTORY file.)** \ No newline at end of file +**(For information about older versions, consult the HISTORY file.)** diff --git a/Modules/_testcapimodule.c b/Modules/_testcapimodule.c --- a/Modules/_testcapimodule.c +++ b/Modules/_testcapimodule.c @@ -1003,6 +1003,15 @@ } static PyObject * +getargs_c(PyObject *self, PyObject *args) +{ + char c; + if (!PyArg_ParseTuple(args, "c", &c)) + return NULL; + return PyBytes_FromStringAndSize(&c, 1); +} + +static PyObject * getargs_s(PyObject *self, PyObject *args) { char *str; @@ -2289,6 +2298,7 @@ (PyCFunction)test_long_long_and_overflow, METH_NOARGS}, {"test_L_code", (PyCFunction)test_L_code, METH_NOARGS}, #endif + {"getargs_c", getargs_c, METH_VARARGS}, {"getargs_s", getargs_s, METH_VARARGS}, {"getargs_s_star", getargs_s_star, METH_VARARGS}, {"getargs_s_hash", getargs_s_hash, METH_VARARGS}, diff --git a/Python/getargs.c b/Python/getargs.c --- a/Python/getargs.c +++ b/Python/getargs.c @@ -828,6 +828,8 @@ char *p = va_arg(*p_va, char *); if (PyBytes_Check(arg) && PyBytes_Size(arg) == 1) *p = PyBytes_AS_STRING(arg)[0]; + else if (PyByteArray_Check(arg) && PyByteArray_Size(arg) == 1) + *p = PyByteArray_AS_STRING(arg)[0]; else return converterr("a byte string of length 1", arg, msgbuf, bufsize); break; -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (ccce01988603): sum=0
by solipsis＠pitrou.net July 29, 2011

July 29, 2011

results for ccce01988603 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflogDAcjtp', '-x']

1 0

cpython (merge 3.2 -> default): merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as
by senthil.kumaran July 28, 2011

July 28, 2011

http://hg.python.org/cpython/rev/6b9f0a6efaeb changeset: 71541:6b9f0a6efaeb parent: 71538:e8da570d29a8 parent: 71540:3e26c9033306 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jul 28 23:39:08 2011 +0800 summary: merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer applicable in hg. Patch Contributed by Neil Muller. files: Lib/curses/__init__.py | 2 -- Lib/curses/panel.py | 2 -- Lib/distutils/__init__.py | 2 -- Lib/distutils/archive_util.py | 2 -- Lib/distutils/bcppcompiler.py | 2 -- Lib/distutils/ccompiler.py | 2 -- Lib/distutils/cmd.py | 2 -- Lib/distutils/command/__init__.py | 2 -- Lib/distutils/command/bdist.py | 2 -- Lib/distutils/command/bdist_dumb.py | 2 -- Lib/distutils/command/bdist_rpm.py | 2 -- Lib/distutils/command/bdist_wininst.py | 2 -- Lib/distutils/command/build.py | 2 -- Lib/distutils/command/build_clib.py | 2 -- Lib/distutils/command/build_ext.py | 2 -- Lib/distutils/command/build_py.py | 2 -- Lib/distutils/command/build_scripts.py | 2 -- Lib/distutils/command/check.py | 2 -- Lib/distutils/command/clean.py | 2 -- Lib/distutils/command/config.py | 2 -- Lib/distutils/command/install.py | 2 -- Lib/distutils/command/install_data.py | 2 -- Lib/distutils/command/install_headers.py | 2 -- Lib/distutils/command/install_lib.py | 2 -- Lib/distutils/command/install_scripts.py | 2 -- Lib/distutils/command/register.py | 2 -- Lib/distutils/command/sdist.py | 2 -- Lib/distutils/core.py | 2 -- Lib/distutils/cygwinccompiler.py | 2 -- Lib/distutils/debug.py | 2 -- Lib/distutils/dep_util.py | 2 -- Lib/distutils/dir_util.py | 2 -- Lib/distutils/dist.py | 2 -- Lib/distutils/emxccompiler.py | 2 -- Lib/distutils/errors.py | 2 -- Lib/distutils/extension.py | 2 -- Lib/distutils/fancy_getopt.py | 2 -- Lib/distutils/file_util.py | 2 -- Lib/distutils/filelist.py | 2 -- Lib/distutils/msvc9compiler.py | 2 -- Lib/distutils/msvccompiler.py | 2 -- Lib/distutils/spawn.py | 2 -- Lib/distutils/sysconfig.py | 2 -- Lib/distutils/tests/test_archive_util.py | 2 -- Lib/distutils/text_file.py | 2 -- Lib/distutils/unixccompiler.py | 2 -- Lib/distutils/util.py | 2 -- Lib/tarfile.py | 4 ++-- Lib/textwrap.py | 2 -- 49 files changed, 2 insertions(+), 98 deletions(-) diff --git a/Lib/curses/__init__.py b/Lib/curses/__init__.py --- a/Lib/curses/__init__.py +++ b/Lib/curses/__init__.py @@ -10,8 +10,6 @@ """ -__revision__ = "$Id$" - from _curses import * import os as _os import sys as _sys diff --git a/Lib/curses/panel.py b/Lib/curses/panel.py --- a/Lib/curses/panel.py +++ b/Lib/curses/panel.py @@ -3,6 +3,4 @@ Module for using panels with curses. """ -__revision__ = "$Id$" - from _curses_panel import * diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -8,8 +8,6 @@ setup (...) """ -__revision__ = "$Id$" - # Distutils version # # Updated automatically by the Python release process. diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -3,8 +3,6 @@ Utility functions for creating archive files (tarballs, zip files, that sort of thing).""" -__revision__ = "$Id$" - import os from warnings import warn import sys diff --git a/Lib/distutils/bcppcompiler.py b/Lib/distutils/bcppcompiler.py --- a/Lib/distutils/bcppcompiler.py +++ b/Lib/distutils/bcppcompiler.py @@ -11,8 +11,6 @@ # someone should sit down and factor out the common code as # WindowsCCompiler! --GPW -__revision__ = "$Id$" - import os from distutils.errors import \ diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -3,8 +3,6 @@ Contains CCompiler, an abstract base class that defines the interface for the Distutils compiler abstraction model.""" -__revision__ = "$Id$" - import sys, os, re from distutils.errors import * from distutils.spawn import spawn diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -4,8 +4,6 @@ in the distutils.command package. """ -__revision__ = "$Id$" - import sys, os, re from distutils.errors import DistutilsOptionError from distutils import util, dir_util, file_util, archive_util, dep_util diff --git a/Lib/distutils/command/__init__.py b/Lib/distutils/command/__init__.py --- a/Lib/distutils/command/__init__.py +++ b/Lib/distutils/command/__init__.py @@ -3,8 +3,6 @@ Package containing implementation of all the standard Distutils commands.""" -__revision__ = "$Id$" - __all__ = ['build', 'build_py', 'build_ext', diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py --- a/Lib/distutils/command/bdist.py +++ b/Lib/distutils/command/bdist.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist' command (create a built [binary] distribution).""" -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.errors import * diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py --- a/Lib/distutils/command/bdist_dumb.py +++ b/Lib/distutils/command/bdist_dumb.py @@ -4,8 +4,6 @@ distribution -- i.e., just an archive to be unpacked under $prefix or $exec_prefix).""" -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.util import get_platform diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist_rpm' command (create RPM source and binary distributions).""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.debug import DEBUG diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist_wininst' command: create a windows installer exe-program.""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.util import get_platform diff --git a/Lib/distutils/command/build.py b/Lib/distutils/command/build.py --- a/Lib/distutils/command/build.py +++ b/Lib/distutils/command/build.py @@ -2,8 +2,6 @@ Implements the Distutils 'build' command.""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.errors import DistutilsOptionError diff --git a/Lib/distutils/command/build_clib.py b/Lib/distutils/command/build_clib.py --- a/Lib/distutils/command/build_clib.py +++ b/Lib/distutils/command/build_clib.py @@ -4,8 +4,6 @@ that is included in the module distribution and needed by an extension module.""" -__revision__ = "$Id$" - # XXX this module has *lots* of code ripped-off quite transparently from # build_ext.py -- not surprisingly really, as the work required to build diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -4,8 +4,6 @@ modules (currently limited to C extensions, should accommodate C++ extensions ASAP).""" -__revision__ = "$Id$" - import sys, os, re from distutils.core import Command from distutils.errors import * diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py --- a/Lib/distutils/command/build_py.py +++ b/Lib/distutils/command/build_py.py @@ -2,8 +2,6 @@ Implements the Distutils 'build_py' command.""" -__revision__ = "$Id$" - import sys, os import sys from glob import glob diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py @@ -2,8 +2,6 @@ Implements the Distutils 'build_scripts' command.""" -__revision__ = "$Id$" - import os, re from stat import ST_MODE from distutils import sysconfig diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py --- a/Lib/distutils/command/check.py +++ b/Lib/distutils/command/check.py @@ -2,8 +2,6 @@ Implements the Distutils 'check' command. """ -__revision__ = "$Id$" - from distutils.core import Command from distutils.errors import DistutilsSetupError diff --git a/Lib/distutils/command/clean.py b/Lib/distutils/command/clean.py --- a/Lib/distutils/command/clean.py +++ b/Lib/distutils/command/clean.py @@ -4,8 +4,6 @@ # contributed by Bastian Kleineidam <calvin(a)cs.uni-sb.de>, added 2000-03-18 -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.dir_util import remove_tree diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py --- a/Lib/distutils/command/config.py +++ b/Lib/distutils/command/config.py @@ -9,8 +9,6 @@ this header file lives". """ -__revision__ = "$Id$" - import sys, os, re from distutils.core import Command diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -2,8 +2,6 @@ Implements the Distutils 'install' command.""" -__revision__ = "$Id$" - import sys import os diff --git a/Lib/distutils/command/install_data.py b/Lib/distutils/command/install_data.py --- a/Lib/distutils/command/install_data.py +++ b/Lib/distutils/command/install_data.py @@ -5,8 +5,6 @@ # contributed by Bastian Kleineidam -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.util import change_root, convert_path diff --git a/Lib/distutils/command/install_headers.py b/Lib/distutils/command/install_headers.py --- a/Lib/distutils/command/install_headers.py +++ b/Lib/distutils/command/install_headers.py @@ -3,8 +3,6 @@ Implements the Distutils 'install_headers' command, to install C/C++ header files to the Python include directory.""" -__revision__ = "$Id$" - from distutils.core import Command diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py --- a/Lib/distutils/command/install_lib.py +++ b/Lib/distutils/command/install_lib.py @@ -3,8 +3,6 @@ Implements the Distutils 'install_lib' command (install all Python modules).""" -__revision__ = "$Id$" - import os import sys diff --git a/Lib/distutils/command/install_scripts.py b/Lib/distutils/command/install_scripts.py --- a/Lib/distutils/command/install_scripts.py +++ b/Lib/distutils/command/install_scripts.py @@ -5,8 +5,6 @@ # contributed by Bastian Kleineidam -__revision__ = "$Id$" - import os from distutils.core import Command from distutils import log diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -5,8 +5,6 @@ # created 2002/10/21, Richard Jones -__revision__ = "$Id$" - import os, string, getpass import io import urllib.parse, urllib.request diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -2,8 +2,6 @@ Implements the Distutils 'sdist' command (create a source distribution).""" -__revision__ = "$Id$" - import os import string import sys diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -6,8 +6,6 @@ really defined in distutils.dist and distutils.cmd. """ -__revision__ = "$Id$" - import os import sys diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -45,8 +45,6 @@ # * mingw gcc 3.2/ld 2.13 works # (ld supports -shared) -__revision__ = "$Id$" - import os import sys import copy diff --git a/Lib/distutils/debug.py b/Lib/distutils/debug.py --- a/Lib/distutils/debug.py +++ b/Lib/distutils/debug.py @@ -1,7 +1,5 @@ import os -__revision__ = "$Id$" - # If DISTUTILS_DEBUG is anything other than the empty string, we run in # debug mode. DEBUG = os.environ.get('DISTUTILS_DEBUG') diff --git a/Lib/distutils/dep_util.py b/Lib/distutils/dep_util.py --- a/Lib/distutils/dep_util.py +++ b/Lib/distutils/dep_util.py @@ -4,8 +4,6 @@ and groups of files; also, function based entirely on such timestamp dependency analysis.""" -__revision__ = "$Id$" - import os from distutils.errors import DistutilsFileError diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -2,8 +2,6 @@ Utility functions for manipulating directories and directory trees.""" -__revision__ = "$Id$" - import os, sys import errno from distutils.errors import DistutilsFileError, DistutilsInternalError diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -4,8 +4,6 @@ being built/installed/distributed. """ -__revision__ = "$Id$" - import sys, os, re try: diff --git a/Lib/distutils/emxccompiler.py b/Lib/distutils/emxccompiler.py --- a/Lib/distutils/emxccompiler.py +++ b/Lib/distutils/emxccompiler.py @@ -19,8 +19,6 @@ # # * EMX gcc 2.81/EMX 0.9d fix03 -__revision__ = "$Id$" - import os,sys,copy from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler diff --git a/Lib/distutils/errors.py b/Lib/distutils/errors.py --- a/Lib/distutils/errors.py +++ b/Lib/distutils/errors.py @@ -8,8 +8,6 @@ This module is safe to use in "from ... import *" mode; it only exports symbols whose names start with "Distutils" and end with "Error".""" -__revision__ = "$Id$" - class DistutilsError (Exception): """The root of all Distutils evil.""" pass diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py --- a/Lib/distutils/extension.py +++ b/Lib/distutils/extension.py @@ -3,8 +3,6 @@ Provides the Extension class, used to describe C/C++ extension modules in setup scripts.""" -__revision__ = "$Id$" - import os import sys import warnings diff --git a/Lib/distutils/fancy_getopt.py b/Lib/distutils/fancy_getopt.py --- a/Lib/distutils/fancy_getopt.py +++ b/Lib/distutils/fancy_getopt.py @@ -8,8 +8,6 @@ * options set attributes of a passed-in object """ -__revision__ = "$Id$" - import sys, string, re import getopt from distutils.errors import * diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -3,8 +3,6 @@ Utility functions for operating on single files. """ -__revision__ = "$Id$" - import os from distutils.errors import DistutilsFileError from distutils import log diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -4,8 +4,6 @@ and building lists of files. """ -__revision__ = "$Id$" - import os, re import fnmatch from distutils.util import convert_path diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -12,8 +12,6 @@ # finding DevStudio (through the registry) # ported to VS2005 and VS 2008 by Christian Heimes -__revision__ = "$Id$" - import os import subprocess import sys diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py --- a/Lib/distutils/msvccompiler.py +++ b/Lib/distutils/msvccompiler.py @@ -8,8 +8,6 @@ # hacked by Robin Becker and Thomas Heller to do a better job of # finding DevStudio (through the registry) -__revision__ = "$Id$" - import sys, os from distutils.errors import \ DistutilsExecError, DistutilsPlatformError, \ diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -6,8 +6,6 @@ executable name. """ -__revision__ = "$Id$" - import sys import os diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -9,8 +9,6 @@ Email: <fdrake(a)acm.org> """ -__revision__ = "$Id$" - import os import re import sys diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -1,6 +1,4 @@ """Tests for distutils.archive_util.""" -__revision__ = "$Id$" - import unittest import os import tarfile diff --git a/Lib/distutils/text_file.py b/Lib/distutils/text_file.py --- a/Lib/distutils/text_file.py +++ b/Lib/distutils/text_file.py @@ -4,8 +4,6 @@ that (optionally) takes care of stripping comments, ignoring blank lines, and joining lines with backslashes.""" -__revision__ = "$Id$" - import sys, os, io diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -13,8 +13,6 @@ * link shared library handled by 'cc -shared' """ -__revision__ = "$Id$" - import os, sys, re from distutils import sysconfig diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -4,8 +4,6 @@ one of the other *util.py modules. """ -__revision__ = "$Id$" - import sys, os, string, re from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer diff --git a/Lib/tarfile.py b/Lib/tarfile.py --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -31,8 +31,8 @@ version = "0.9.0" __author__ = "Lars Gust\u00e4bel (lars(a)gustaebel.de)" -__date__ = "$Date$" -__cvsid__ = "$Id$" +__date__ = "$Date: 2011-02-25 17:42:01 +0200 (Fri, 25 Feb 2011) $" +__cvsid__ = "$Id: tarfile.py 88586 2011-02-25 15:42:01Z marc-andre.lemburg $" __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend." #--------- diff --git a/Lib/textwrap.py b/Lib/textwrap.py --- a/Lib/textwrap.py +++ b/Lib/textwrap.py @@ -5,8 +5,6 @@ # Copyright (C) 2002, 2003 Python Software Foundation. # Written by Greg Ward <gward(a)python.net> -__revision__ = "$Id$" - import re __all__ = ['TextWrapper', 'wrap', 'fill', 'dedent'] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer
by senthil.kumaran July 28, 2011

July 28, 2011

http://hg.python.org/cpython/rev/3e26c9033306 changeset: 71540:3e26c9033306 branch: 3.2 parent: 71537:aa9c0fdf2143 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jul 28 22:32:49 2011 +0800 summary: Fix closes Issue11439 Remove the SVN keywords from the code as it is no longer applicable in hg. Patch Contributed by Neil Muller. files: Lib/curses/__init__.py | 2 -- Lib/curses/panel.py | 2 -- Lib/distutils/__init__.py | 2 -- Lib/distutils/archive_util.py | 2 -- Lib/distutils/bcppcompiler.py | 2 -- Lib/distutils/ccompiler.py | 2 -- Lib/distutils/cmd.py | 2 -- Lib/distutils/command/__init__.py | 2 -- Lib/distutils/command/bdist.py | 2 -- Lib/distutils/command/bdist_dumb.py | 2 -- Lib/distutils/command/bdist_rpm.py | 2 -- Lib/distutils/command/bdist_wininst.py | 2 -- Lib/distutils/command/build.py | 2 -- Lib/distutils/command/build_clib.py | 2 -- Lib/distutils/command/build_ext.py | 2 -- Lib/distutils/command/build_py.py | 2 -- Lib/distutils/command/build_scripts.py | 2 -- Lib/distutils/command/check.py | 2 -- Lib/distutils/command/clean.py | 2 -- Lib/distutils/command/config.py | 2 -- Lib/distutils/command/install.py | 2 -- Lib/distutils/command/install_data.py | 2 -- Lib/distutils/command/install_headers.py | 2 -- Lib/distutils/command/install_lib.py | 2 -- Lib/distutils/command/install_scripts.py | 2 -- Lib/distutils/command/register.py | 2 -- Lib/distutils/command/sdist.py | 2 -- Lib/distutils/core.py | 2 -- Lib/distutils/cygwinccompiler.py | 2 -- Lib/distutils/debug.py | 2 -- Lib/distutils/dep_util.py | 2 -- Lib/distutils/dir_util.py | 2 -- Lib/distutils/dist.py | 2 -- Lib/distutils/emxccompiler.py | 2 -- Lib/distutils/errors.py | 2 -- Lib/distutils/extension.py | 2 -- Lib/distutils/fancy_getopt.py | 2 -- Lib/distutils/file_util.py | 2 -- Lib/distutils/filelist.py | 2 -- Lib/distutils/msvc9compiler.py | 2 -- Lib/distutils/msvccompiler.py | 2 -- Lib/distutils/spawn.py | 2 -- Lib/distutils/sysconfig.py | 2 -- Lib/distutils/tests/test_archive_util.py | 2 -- Lib/distutils/text_file.py | 2 -- Lib/distutils/unixccompiler.py | 2 -- Lib/distutils/util.py | 2 -- Lib/tarfile.py | 4 ++-- Lib/textwrap.py | 2 -- 49 files changed, 2 insertions(+), 98 deletions(-) diff --git a/Lib/curses/__init__.py b/Lib/curses/__init__.py --- a/Lib/curses/__init__.py +++ b/Lib/curses/__init__.py @@ -10,8 +10,6 @@ """ -__revision__ = "$Id$" - from _curses import * from curses.wrapper import wrapper import os as _os diff --git a/Lib/curses/panel.py b/Lib/curses/panel.py --- a/Lib/curses/panel.py +++ b/Lib/curses/panel.py @@ -3,6 +3,4 @@ Module for using panels with curses. """ -__revision__ = "$Id$" - from _curses_panel import * diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -8,8 +8,6 @@ setup (...) """ -__revision__ = "$Id$" - # Distutils version # # Updated automatically by the Python release process. diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py --- a/Lib/distutils/archive_util.py +++ b/Lib/distutils/archive_util.py @@ -3,8 +3,6 @@ Utility functions for creating archive files (tarballs, zip files, that sort of thing).""" -__revision__ = "$Id$" - import os from warnings import warn import sys diff --git a/Lib/distutils/bcppcompiler.py b/Lib/distutils/bcppcompiler.py --- a/Lib/distutils/bcppcompiler.py +++ b/Lib/distutils/bcppcompiler.py @@ -11,8 +11,6 @@ # someone should sit down and factor out the common code as # WindowsCCompiler! --GPW -__revision__ = "$Id$" - import os from distutils.errors import \ diff --git a/Lib/distutils/ccompiler.py b/Lib/distutils/ccompiler.py --- a/Lib/distutils/ccompiler.py +++ b/Lib/distutils/ccompiler.py @@ -3,8 +3,6 @@ Contains CCompiler, an abstract base class that defines the interface for the Distutils compiler abstraction model.""" -__revision__ = "$Id$" - import sys, os, re from distutils.errors import * from distutils.spawn import spawn diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py --- a/Lib/distutils/cmd.py +++ b/Lib/distutils/cmd.py @@ -4,8 +4,6 @@ in the distutils.command package. """ -__revision__ = "$Id$" - import sys, os, re from distutils.errors import DistutilsOptionError from distutils import util, dir_util, file_util, archive_util, dep_util diff --git a/Lib/distutils/command/__init__.py b/Lib/distutils/command/__init__.py --- a/Lib/distutils/command/__init__.py +++ b/Lib/distutils/command/__init__.py @@ -3,8 +3,6 @@ Package containing implementation of all the standard Distutils commands.""" -__revision__ = "$Id$" - __all__ = ['build', 'build_py', 'build_ext', diff --git a/Lib/distutils/command/bdist.py b/Lib/distutils/command/bdist.py --- a/Lib/distutils/command/bdist.py +++ b/Lib/distutils/command/bdist.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist' command (create a built [binary] distribution).""" -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.errors import * diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py --- a/Lib/distutils/command/bdist_dumb.py +++ b/Lib/distutils/command/bdist_dumb.py @@ -4,8 +4,6 @@ distribution -- i.e., just an archive to be unpacked under $prefix or $exec_prefix).""" -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.util import get_platform diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist_rpm' command (create RPM source and binary distributions).""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.debug import DEBUG diff --git a/Lib/distutils/command/bdist_wininst.py b/Lib/distutils/command/bdist_wininst.py --- a/Lib/distutils/command/bdist_wininst.py +++ b/Lib/distutils/command/bdist_wininst.py @@ -3,8 +3,6 @@ Implements the Distutils 'bdist_wininst' command: create a windows installer exe-program.""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.util import get_platform diff --git a/Lib/distutils/command/build.py b/Lib/distutils/command/build.py --- a/Lib/distutils/command/build.py +++ b/Lib/distutils/command/build.py @@ -2,8 +2,6 @@ Implements the Distutils 'build' command.""" -__revision__ = "$Id$" - import sys, os from distutils.core import Command from distutils.errors import DistutilsOptionError diff --git a/Lib/distutils/command/build_clib.py b/Lib/distutils/command/build_clib.py --- a/Lib/distutils/command/build_clib.py +++ b/Lib/distutils/command/build_clib.py @@ -4,8 +4,6 @@ that is included in the module distribution and needed by an extension module.""" -__revision__ = "$Id$" - # XXX this module has *lots* of code ripped-off quite transparently from # build_ext.py -- not surprisingly really, as the work required to build diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py --- a/Lib/distutils/command/build_ext.py +++ b/Lib/distutils/command/build_ext.py @@ -4,8 +4,6 @@ modules (currently limited to C extensions, should accommodate C++ extensions ASAP).""" -__revision__ = "$Id$" - import sys, os, re from distutils.core import Command from distutils.errors import * diff --git a/Lib/distutils/command/build_py.py b/Lib/distutils/command/build_py.py --- a/Lib/distutils/command/build_py.py +++ b/Lib/distutils/command/build_py.py @@ -2,8 +2,6 @@ Implements the Distutils 'build_py' command.""" -__revision__ = "$Id$" - import sys, os import sys from glob import glob diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py @@ -2,8 +2,6 @@ Implements the Distutils 'build_scripts' command.""" -__revision__ = "$Id$" - import os, re from stat import ST_MODE from distutils import sysconfig diff --git a/Lib/distutils/command/check.py b/Lib/distutils/command/check.py --- a/Lib/distutils/command/check.py +++ b/Lib/distutils/command/check.py @@ -2,8 +2,6 @@ Implements the Distutils 'check' command. """ -__revision__ = "$Id$" - from distutils.core import Command from distutils.errors import DistutilsSetupError diff --git a/Lib/distutils/command/clean.py b/Lib/distutils/command/clean.py --- a/Lib/distutils/command/clean.py +++ b/Lib/distutils/command/clean.py @@ -4,8 +4,6 @@ # contributed by Bastian Kleineidam <calvin(a)cs.uni-sb.de>, added 2000-03-18 -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.dir_util import remove_tree diff --git a/Lib/distutils/command/config.py b/Lib/distutils/command/config.py --- a/Lib/distutils/command/config.py +++ b/Lib/distutils/command/config.py @@ -9,8 +9,6 @@ this header file lives". """ -__revision__ = "$Id$" - import sys, os, re from distutils.core import Command diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -2,8 +2,6 @@ Implements the Distutils 'install' command.""" -__revision__ = "$Id$" - import sys import os diff --git a/Lib/distutils/command/install_data.py b/Lib/distutils/command/install_data.py --- a/Lib/distutils/command/install_data.py +++ b/Lib/distutils/command/install_data.py @@ -5,8 +5,6 @@ # contributed by Bastian Kleineidam -__revision__ = "$Id$" - import os from distutils.core import Command from distutils.util import change_root, convert_path diff --git a/Lib/distutils/command/install_headers.py b/Lib/distutils/command/install_headers.py --- a/Lib/distutils/command/install_headers.py +++ b/Lib/distutils/command/install_headers.py @@ -3,8 +3,6 @@ Implements the Distutils 'install_headers' command, to install C/C++ header files to the Python include directory.""" -__revision__ = "$Id$" - from distutils.core import Command diff --git a/Lib/distutils/command/install_lib.py b/Lib/distutils/command/install_lib.py --- a/Lib/distutils/command/install_lib.py +++ b/Lib/distutils/command/install_lib.py @@ -3,8 +3,6 @@ Implements the Distutils 'install_lib' command (install all Python modules).""" -__revision__ = "$Id$" - import os import sys diff --git a/Lib/distutils/command/install_scripts.py b/Lib/distutils/command/install_scripts.py --- a/Lib/distutils/command/install_scripts.py +++ b/Lib/distutils/command/install_scripts.py @@ -5,8 +5,6 @@ # contributed by Bastian Kleineidam -__revision__ = "$Id$" - import os from distutils.core import Command from distutils import log diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -5,8 +5,6 @@ # created 2002/10/21, Richard Jones -__revision__ = "$Id$" - import os, string, getpass import io import urllib.parse, urllib.request diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -2,8 +2,6 @@ Implements the Distutils 'sdist' command (create a source distribution).""" -__revision__ = "$Id$" - import os import string import sys diff --git a/Lib/distutils/core.py b/Lib/distutils/core.py --- a/Lib/distutils/core.py +++ b/Lib/distutils/core.py @@ -6,8 +6,6 @@ really defined in distutils.dist and distutils.cmd. """ -__revision__ = "$Id$" - import os import sys diff --git a/Lib/distutils/cygwinccompiler.py b/Lib/distutils/cygwinccompiler.py --- a/Lib/distutils/cygwinccompiler.py +++ b/Lib/distutils/cygwinccompiler.py @@ -45,8 +45,6 @@ # * mingw gcc 3.2/ld 2.13 works # (ld supports -shared) -__revision__ = "$Id$" - import os import sys import copy diff --git a/Lib/distutils/debug.py b/Lib/distutils/debug.py --- a/Lib/distutils/debug.py +++ b/Lib/distutils/debug.py @@ -1,7 +1,5 @@ import os -__revision__ = "$Id$" - # If DISTUTILS_DEBUG is anything other than the empty string, we run in # debug mode. DEBUG = os.environ.get('DISTUTILS_DEBUG') diff --git a/Lib/distutils/dep_util.py b/Lib/distutils/dep_util.py --- a/Lib/distutils/dep_util.py +++ b/Lib/distutils/dep_util.py @@ -4,8 +4,6 @@ and groups of files; also, function based entirely on such timestamp dependency analysis.""" -__revision__ = "$Id$" - import os from distutils.errors import DistutilsFileError diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py --- a/Lib/distutils/dir_util.py +++ b/Lib/distutils/dir_util.py @@ -2,8 +2,6 @@ Utility functions for manipulating directories and directory trees.""" -__revision__ = "$Id$" - import os, sys import errno from distutils.errors import DistutilsFileError, DistutilsInternalError diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py --- a/Lib/distutils/dist.py +++ b/Lib/distutils/dist.py @@ -4,8 +4,6 @@ being built/installed/distributed. """ -__revision__ = "$Id$" - import sys, os, re try: diff --git a/Lib/distutils/emxccompiler.py b/Lib/distutils/emxccompiler.py --- a/Lib/distutils/emxccompiler.py +++ b/Lib/distutils/emxccompiler.py @@ -19,8 +19,6 @@ # # * EMX gcc 2.81/EMX 0.9d fix03 -__revision__ = "$Id$" - import os,sys,copy from distutils.ccompiler import gen_preprocess_options, gen_lib_options from distutils.unixccompiler import UnixCCompiler diff --git a/Lib/distutils/errors.py b/Lib/distutils/errors.py --- a/Lib/distutils/errors.py +++ b/Lib/distutils/errors.py @@ -8,8 +8,6 @@ This module is safe to use in "from ... import *" mode; it only exports symbols whose names start with "Distutils" and end with "Error".""" -__revision__ = "$Id$" - class DistutilsError (Exception): """The root of all Distutils evil.""" pass diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py --- a/Lib/distutils/extension.py +++ b/Lib/distutils/extension.py @@ -3,8 +3,6 @@ Provides the Extension class, used to describe C/C++ extension modules in setup scripts.""" -__revision__ = "$Id$" - import os import sys import warnings diff --git a/Lib/distutils/fancy_getopt.py b/Lib/distutils/fancy_getopt.py --- a/Lib/distutils/fancy_getopt.py +++ b/Lib/distutils/fancy_getopt.py @@ -8,8 +8,6 @@ * options set attributes of a passed-in object """ -__revision__ = "$Id$" - import sys, string, re import getopt from distutils.errors import * diff --git a/Lib/distutils/file_util.py b/Lib/distutils/file_util.py --- a/Lib/distutils/file_util.py +++ b/Lib/distutils/file_util.py @@ -3,8 +3,6 @@ Utility functions for operating on single files. """ -__revision__ = "$Id$" - import os from distutils.errors import DistutilsFileError from distutils import log diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -4,8 +4,6 @@ and building lists of files. """ -__revision__ = "$Id$" - import os, re import fnmatch from distutils.util import convert_path diff --git a/Lib/distutils/msvc9compiler.py b/Lib/distutils/msvc9compiler.py --- a/Lib/distutils/msvc9compiler.py +++ b/Lib/distutils/msvc9compiler.py @@ -12,8 +12,6 @@ # finding DevStudio (through the registry) # ported to VS2005 and VS 2008 by Christian Heimes -__revision__ = "$Id$" - import os import subprocess import sys diff --git a/Lib/distutils/msvccompiler.py b/Lib/distutils/msvccompiler.py --- a/Lib/distutils/msvccompiler.py +++ b/Lib/distutils/msvccompiler.py @@ -8,8 +8,6 @@ # hacked by Robin Becker and Thomas Heller to do a better job of # finding DevStudio (through the registry) -__revision__ = "$Id$" - import sys, os from distutils.errors import \ DistutilsExecError, DistutilsPlatformError, \ diff --git a/Lib/distutils/spawn.py b/Lib/distutils/spawn.py --- a/Lib/distutils/spawn.py +++ b/Lib/distutils/spawn.py @@ -6,8 +6,6 @@ executable name. """ -__revision__ = "$Id$" - import sys import os diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -9,8 +9,6 @@ Email: <fdrake(a)acm.org> """ -__revision__ = "$Id$" - import os import re import sys diff --git a/Lib/distutils/tests/test_archive_util.py b/Lib/distutils/tests/test_archive_util.py --- a/Lib/distutils/tests/test_archive_util.py +++ b/Lib/distutils/tests/test_archive_util.py @@ -1,6 +1,4 @@ """Tests for distutils.archive_util.""" -__revision__ = "$Id$" - import unittest import os import tarfile diff --git a/Lib/distutils/text_file.py b/Lib/distutils/text_file.py --- a/Lib/distutils/text_file.py +++ b/Lib/distutils/text_file.py @@ -4,8 +4,6 @@ that (optionally) takes care of stripping comments, ignoring blank lines, and joining lines with backslashes.""" -__revision__ = "$Id$" - import sys, os, io diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -13,8 +13,6 @@ * link shared library handled by 'cc -shared' """ -__revision__ = "$Id$" - import os, sys, re from distutils import sysconfig diff --git a/Lib/distutils/util.py b/Lib/distutils/util.py --- a/Lib/distutils/util.py +++ b/Lib/distutils/util.py @@ -4,8 +4,6 @@ one of the other *util.py modules. """ -__revision__ = "$Id$" - import sys, os, string, re from distutils.errors import DistutilsPlatformError from distutils.dep_util import newer diff --git a/Lib/tarfile.py b/Lib/tarfile.py --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -33,8 +33,8 @@ version = "0.9.0" __author__ = "Lars Gust\u00e4bel (lars(a)gustaebel.de)" -__date__ = "$Date$" -__cvsid__ = "$Id$" +__date__ = "$Date: 2011-02-25 17:42:01 +0200 (Fri, 25 Feb 2011) $" +__cvsid__ = "$Id: tarfile.py 88586 2011-02-25 15:42:01Z marc-andre.lemburg $" __credits__ = "Gustavo Niemeyer, Niels Gust\u00e4bel, Richard Townsend." #--------- diff --git a/Lib/textwrap.py b/Lib/textwrap.py --- a/Lib/textwrap.py +++ b/Lib/textwrap.py @@ -5,8 +5,6 @@ # Copyright (C) 2002, 2003 Python Software Foundation. # Written by Greg Ward <gward(a)python.net> -__revision__ = "$Id$" - import string, re __all__ = ['TextWrapper', 'wrap', 'fill', 'dedent'] -- Repository URL: http://hg.python.org/cpython

1 0

cpython (2.7): Fix closes Issue11439 - Handle the SVN Keywords in 2.7 by replacing them with a
by senthil.kumaran July 28, 2011

July 28, 2011

http://hg.python.org/cpython/rev/f15442543e24 changeset: 71539:f15442543e24 branch: 2.7 parent: 71536:f9cf55bbe9b9 user: Senthil Kumaran <senthil(a)uthcode.com> date: Thu Jul 28 22:30:27 2011 +0800 summary: Fix closes Issue11439 - Handle the SVN Keywords in 2.7 by replacing them with a high number so that code relying on them does not break. files: Lib/lib-tk/Tkinter.py | 2 +- Lib/pickle.py | 2 +- Lib/pydoc.py | 2 +- Lib/tarfile.py | 2 +- Lib/xml/parsers/expat.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Lib/lib-tk/Tkinter.py b/Lib/lib-tk/Tkinter.py --- a/Lib/lib-tk/Tkinter.py +++ b/Lib/lib-tk/Tkinter.py @@ -30,7 +30,7 @@ tk.mainloop() """ -__version__ = "$Revision$" +__version__ = "$Revision: 81008 $" import sys if sys.platform == "win32": diff --git a/Lib/pickle.py b/Lib/pickle.py --- a/Lib/pickle.py +++ b/Lib/pickle.py @@ -24,7 +24,7 @@ """ -__version__ = "$Revision$" # Code version +__version__ = "$Revision: 72223 $" # Code version from types import * from copy_reg import dispatch_table diff --git a/Lib/pydoc.py b/Lib/pydoc.py --- a/Lib/pydoc.py +++ b/Lib/pydoc.py @@ -37,7 +37,7 @@ __author__ = "Ka-Ping Yee <ping(a)lfw.org>" __date__ = "26 February 2001" -__version__ = "$Revision$" +__version__ = "$Revision: 88564 $" __credits__ = """Guido van Rossum, for an excellent programming language. Tommy Burnette, the original creator of manpy. Paul Prescod, for all his work on onlinehelp. diff --git a/Lib/tarfile.py b/Lib/tarfile.py --- a/Lib/tarfile.py +++ b/Lib/tarfile.py @@ -30,7 +30,7 @@ """Read from and write to tar format archives. """ -__version__ = "$Revision$" +__version__ = "$Revision: 85213 $" # $Source$ version = "0.9.0" diff --git a/Lib/xml/parsers/expat.py b/Lib/xml/parsers/expat.py --- a/Lib/xml/parsers/expat.py +++ b/Lib/xml/parsers/expat.py @@ -1,4 +1,4 @@ """Interface to the Expat non-validating XML parser.""" -__version__ = '$Revision$' +__version__ = '$Revision: 17640 $' from pyexpat import * -- Repository URL: http://hg.python.org/cpython

1 0

Daily reference leaks (e8da570d29a8): sum=0
by solipsis＠pitrou.net July 28, 2011

July 28, 2011

results for e8da570d29a8 on branch "default" -------------------------------------------- Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/antoine/cpython/refleaks/reflog7khFUw', '-x']

1 0

peps: PEP 400
by victor.stinner July 27, 2011

July 27, 2011

http://hg.python.org/peps/rev/6a982a2072cd changeset: 3915:6a982a2072cd user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jul 27 23:45:52 2011 +0200 summary: PEP 400 * don't be strict on the version removing the code: 3.4 *or maybe later* * rephrase some sentences * mention that StreamReaderWriter is similar than io.BufferedRWPair * add internal links on the Appendix A * add links on issues an PEPs files: pep-0400.txt | 45 ++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 20 deletions(-) diff --git a/pep-0400.txt b/pep-0400.txt --- a/pep-0400.txt +++ b/pep-0400.txt @@ -19,9 +19,11 @@ twice and that we may have subtle differences between the two implementations. -The codecs module was introduced in Python 2.0, see the PEP 100. The -io module was introduced in Python 2.6 and 3.0 (see the PEP 3116), and -reimplemented in C in Python 2.7 and 3.1. +The codecs module was introduced in Python 2.0 (see the `PEP 100 +<http://www.python.org/dev/peps/pep-0100/>`_). The io module was +introduced in Python 2.6 and 3.0 (see the `PEP 3116 +<http://www.python.org/dev/peps/pep-3116/>`_), and reimplemented in C in +Python 2.7 and 3.1. Motivation @@ -45,7 +47,7 @@ implementations in addition to the core codec encode() and decode() methods. This places a heavy burden on codec authors providing these specialised implementations to correctly handle many of the corner -cases that have now been dealt with by io.TextIOWrapper. While deeper +cases (see `Appendix A`_) that have now been dealt with by io.TextIOWrapper. While deeper integration between the codec and the stream allows for additional optimisations in theory, these optimisations have in practice either not been carried out and else the associated code duplication means @@ -70,17 +72,16 @@ * StreamReader is unable to translate newlines. * StreamReaderWriter handles reads using StreamReader and writes - using StreamWriter. These two classes may be inconsistent. To stay - consistent, flush() must be called after each write which slows - down interlaced read-write. + using StreamWriter (as io.BufferedRWPair). These two classes may be + inconsistent. To stay consistent, flush() must be called after each + write which slows down interlaced read-write. * StreamWriter doesn't support "line buffering" (flush if the input text contains a newline). - * StreamReader classes of the CJK encodings (e.g. GB18030) don't - support universal newlines, only UNIX newlines ('\\n'). + * StreamReader classes of the CJK encodings (e.g. GB18030) only + supports UNIX newlines ('\\n'). * StreamReader and StreamWriter are stateful codecs but don't expose functions to control their state (getstate() or setstate()). Each - codec has to implement corner cases, see "Issue with stateful - codecs". + codec has to handle corner cases, see `Appendix A`_. * StreamReader and StreamWriter are very similar to IncrementalReader and IncrementalEncoder, some code is duplicated for stateful codecs (e.g. UTF-16). @@ -90,7 +91,7 @@ * No codec implements an optimized method in StreamReader or StreamWriter based on the specificities of the codec. -Other issues in the bug tracker: +Issues in the bug tracker: * `Issue #5445 <http://bugs.python.org/issue5445>`_ (2009-03-08): codecs.StreamWriter.writelines problem when passed generator @@ -120,7 +121,7 @@ * TextIOWrapper supports any kind of newline, including translating newlines (to UNIX newlines), to read and write. - * TextIOWrapper reuses incremental encoders and decoders (no + * TextIOWrapper reuses codecs incremental encoders and decoders (no duplication of code). * The io module (TextIOWrapper) is faster than the codecs module (StreamReader). It is implemented in C, whereas codecs is @@ -182,7 +183,8 @@ '''''''''''''''''''''''''''''''' codecs.open() can be replaced by the builtin open() function. open() -has a similar API but has also more options. +has a similar API but has also more options. Both functions return +file-like objects (same API). codecs.open() was the only way to open a text file in Unicode mode until Python 2.6. Many Python 2 programs uses this function. Removing @@ -204,11 +206,12 @@ (TextIOWrapper). EncodedFile(), StreamRandom, StreamReader, StreamReaderWriter and -StreamWriter will be removed in Python 3.4. +StreamWriter will be removed in Python 3.4 (or maybe later). +.. _Appendix A: -Issue with stateful codecs -========================== +Appendix A: Issues with stateful codecs +======================================= It is difficult to use correctly a stateful codec with a stream. Some cases are supported by the codecs module, while io has no more known @@ -279,7 +282,8 @@ assert f.read() == '###def' The io module supports this usecase, whereas codecs fails because it -writes a new BOM on the second write (issue #12512). +writes a new BOM on the second write (`issue #12512 +<http://bugs.python.org/issue12512>`_). Append mode ''''''''''' @@ -294,7 +298,8 @@ assert f.read() == 'abcdef' The io module supports this usecase, whereas codecs fails because it -writes a new BOM on the second write (issue #12512). +writes a new BOM on the second write (`issue #12512 +<http://bugs.python.org/issue12512>`_). Links @@ -302,7 +307,7 @@ * `PEP 100: Python Unicode Integration <http://www.python.org/dev/peps/pep-0100/>`_ - * `PEP 3116 <http://www.python.org/dev/peps/pep-3116/>`_ + * `PEP 3116: New I/O <http://www.python.org/dev/peps/pep-3116/>`_ * `Issue #8796: Deprecate codecs.open() <http://bugs.python.org/issue8796>`_ * `[python-dev] Deprecate codecs.open() and StreamWriter/StreamReader -- Repository URL: http://hg.python.org/peps

1 0

cpython (merge 3.2 -> default): Issue #11871: In test_threading.BarrierTests, bump the default barrier timeout
by charles-francois.natali July 27, 2011

July 27, 2011

http://hg.python.org/cpython/rev/e8da570d29a8 changeset: 71538:e8da570d29a8 parent: 71535:5f003d725619 parent: 71537:aa9c0fdf2143 user: Charles-François Natali <neologix(a)free.fr> date: Wed Jul 27 21:28:23 2011 +0200 summary: Issue #11871: In test_threading.BarrierTests, bump the default barrier timeout to avoid timing-dependent failures. files: Lib/test/lock_tests.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -834,12 +834,12 @@ """ Test the barrier's default timeout """ - #create a barrier with a low default timeout - barrier = self.barriertype(self.N, timeout=0.1) + # create a barrier with a low default timeout + barrier = self.barriertype(self.N, timeout=0.3) def f(): i = barrier.wait() if i == self.N // 2: - # One thread is later than the default timeout of 0.1s. + # One thread is later than the default timeout of 0.3s. time.sleep(1.0) self.assertRaises(threading.BrokenBarrierError, barrier.wait) self.run_threads(f) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #11871: In test_threading.BarrierTests, bump the default barrier timeout
by charles-francois.natali July 27, 2011

July 27, 2011

http://hg.python.org/cpython/rev/aa9c0fdf2143 changeset: 71537:aa9c0fdf2143 branch: 3.2 parent: 71534:2bc740a83010 user: Charles-François Natali <neologix(a)free.fr> date: Wed Jul 27 21:26:42 2011 +0200 summary: Issue #11871: In test_threading.BarrierTests, bump the default barrier timeout to avoid timing-dependent failures. files: Lib/test/lock_tests.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py --- a/Lib/test/lock_tests.py +++ b/Lib/test/lock_tests.py @@ -832,12 +832,12 @@ """ Test the barrier's default timeout """ - #create a barrier with a low default timeout - barrier = self.barriertype(self.N, timeout=0.1) + # create a barrier with a low default timeout + barrier = self.barriertype(self.N, timeout=0.3) def f(): i = barrier.wait() if i == self.N // 2: - # One thread is later than the default timeout of 0.1s. + # One thread is later than the default timeout of 0.3s. time.sleep(1.0) self.assertRaises(threading.BrokenBarrierError, barrier.wait) self.run_threads(f) -- Repository URL: http://hg.python.org/cpython

1 0