[Python-checkins] cpython (merge 3.2 -> default): merge from 3.2 - Fix closes Issue11439 Remove the SVN keywords from the code as

senthil.kumaran python-checkins at python.org
Thu Jul 28 17:39:47 CEST 2011 

http://hg.python.org/cpython/rev/6b9f0a6efaeb
changeset:   71541:6b9f0a6efaeb
parent:      71538:e8da570d29a8
parent:      71540:3e26c9033306
user:        Senthil Kumaran <senthil at 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 at 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 at 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 at 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 at python.net>
 
-__revision__ = "$Id$"
-
 import re
 
 __all__ = ['TextWrapper', 'wrap', 'fill', 'dedent']

-- 
Repository URL: http://hg.python.org/cpython

More information about the Python-checkins mailing list