diff options
author | Christian Heimes <christian@cheimes.de> | 2008-02-23 18:30:17 (GMT) |
---|---|---|
committer | Christian Heimes <christian@cheimes.de> | 2008-02-23 18:30:17 (GMT) |
commit | 05e8be17fd15d8e649e026600f5ab20e1154599f (patch) | |
tree | aecf3cd024e9cf2ed2ae49087b6c74dba29c7c7e /Lib/distutils | |
parent | 5abe9125f9eb858fdaca966d687bb32387603f45 (diff) | |
download | cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.zip cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.tar.gz cpython-05e8be17fd15d8e649e026600f5ab20e1154599f.tar.bz2 |
Merged revisions 60990-61002 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r60990 | eric.smith | 2008-02-23 17:05:26 +0100 (Sat, 23 Feb 2008) | 1 line
Removed duplicate Py_CHARMASK define. It's already defined in Python.h.
........
r60991 | andrew.kuchling | 2008-02-23 17:23:05 +0100 (Sat, 23 Feb 2008) | 4 lines
#1330538: Improve comparison of xmlrpclib.DateTime and datetime instances.
Remove automatic handling of datetime.date and datetime.time.
This breaks backward compatibility, but python-dev discussion was strongly
against this automatic conversion; see the bug for a link.
........
r60994 | andrew.kuchling | 2008-02-23 17:39:43 +0100 (Sat, 23 Feb 2008) | 1 line
#835521: Add index entries for various pickle-protocol methods and attributes
........
r60995 | andrew.kuchling | 2008-02-23 18:10:46 +0100 (Sat, 23 Feb 2008) | 2 lines
#1433694: minidom's .normalize() failed to set .nextSibling for last element.
Fix by Malte Helmert
........
r61000 | christian.heimes | 2008-02-23 18:40:11 +0100 (Sat, 23 Feb 2008) | 1 line
Patch #2167 from calvin: Remove unused imports
........
r61001 | christian.heimes | 2008-02-23 18:42:31 +0100 (Sat, 23 Feb 2008) | 1 line
Patch #1957: syslogmodule: Release GIL when calling syslog(3)
........
r61002 | christian.heimes | 2008-02-23 18:52:07 +0100 (Sat, 23 Feb 2008) | 2 lines
Issue #2051 and patch from Alexander Belopolsky:
Permission for pyc and pyo files are inherited from the py file.
........
Diffstat (limited to 'Lib/distutils')
-rw-r--r-- | Lib/distutils/bcppcompiler.py | 2 | ||||
-rw-r--r-- | Lib/distutils/command/bdist_dumb.py | 2 | ||||
-rw-r--r-- | Lib/distutils/command/bdist_rpm.py | 1 | ||||
-rw-r--r-- | Lib/distutils/command/build_scripts.py | 2 | ||||
-rw-r--r-- | Lib/distutils/command/install.py | 1 | ||||
-rw-r--r-- | Lib/distutils/command/install_headers.py | 1 | ||||
-rw-r--r-- | Lib/distutils/command/register.py | 2 | ||||
-rw-r--r-- | Lib/distutils/filelist.py | 1 | ||||
-rw-r--r-- | Lib/distutils/tests/test_dist.py | 2 | ||||
-rw-r--r-- | Lib/distutils/tests/test_sysconfig.py | 1 | ||||
-rw-r--r-- | Lib/distutils/unixccompiler.py | 1 |
11 files changed, 4 insertions, 12 deletions
diff --git a/Lib/distutils/bcppcompiler.py b/Lib/distutils/bcppcompiler.py index 1ab76c5..c5e5cd2 100644 --- a/Lib/distutils/bcppcompiler.py +++ b/Lib/distutils/bcppcompiler.py @@ -14,7 +14,7 @@ for the Borland C++ compiler. __revision__ = "$Id$" -import sys, os +import os from distutils.errors import \ DistutilsExecError, DistutilsPlatformError, \ CompileError, LibError, LinkError, UnknownFileError diff --git a/Lib/distutils/command/bdist_dumb.py b/Lib/distutils/command/bdist_dumb.py index f899617..2d39922 100644 --- a/Lib/distutils/command/bdist_dumb.py +++ b/Lib/distutils/command/bdist_dumb.py @@ -9,7 +9,7 @@ __revision__ = "$Id$" import os from distutils.core import Command from distutils.util import get_platform -from distutils.dir_util import create_tree, remove_tree, ensure_relative +from distutils.dir_util import remove_tree, ensure_relative from distutils.errors import * from distutils.sysconfig import get_python_version from distutils import log diff --git a/Lib/distutils/command/bdist_rpm.py b/Lib/distutils/command/bdist_rpm.py index 72f74f9..83efb8e 100644 --- a/Lib/distutils/command/bdist_rpm.py +++ b/Lib/distutils/command/bdist_rpm.py @@ -6,7 +6,6 @@ distributions).""" __revision__ = "$Id$" import sys, os -import glob from distutils.core import Command from distutils.debug import DEBUG from distutils.util import get_platform diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py index 7b44264..3ac5b0c 100644 --- a/Lib/distutils/command/build_scripts.py +++ b/Lib/distutils/command/build_scripts.py @@ -4,7 +4,7 @@ Implements the Distutils 'build_scripts' command.""" __revision__ = "$Id$" -import sys, os, re +import os, re from stat import ST_MODE from distutils import sysconfig from distutils.core import Command diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index b768663..e4ee680 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -14,7 +14,6 @@ from distutils.errors import DistutilsPlatformError from distutils.file_util import write_file from distutils.util import convert_path, subst_vars, change_root from distutils.errors import DistutilsOptionError -from glob import glob if sys.version < "2.2": WINDOWS_SCHEME = { diff --git a/Lib/distutils/command/install_headers.py b/Lib/distutils/command/install_headers.py index 7114eaf..346daaa 100644 --- a/Lib/distutils/command/install_headers.py +++ b/Lib/distutils/command/install_headers.py @@ -5,7 +5,6 @@ files to the Python include directory.""" __revision__ = "$Id$" -import os from distutils.core import Command diff --git a/Lib/distutils/command/register.py b/Lib/distutils/command/register.py index d123d32..40d9f20 100644 --- a/Lib/distutils/command/register.py +++ b/Lib/distutils/command/register.py @@ -7,7 +7,7 @@ Implements the Distutils 'register' command (register with the repository). __revision__ = "$Id$" -import sys, os, urllib2, getpass, urlparse +import os, string, urllib2, getpass, urlparse import io, ConfigParser from distutils.core import Command diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py index 6506c30..8eab0a9 100644 --- a/Lib/distutils/filelist.py +++ b/Lib/distutils/filelist.py @@ -8,7 +8,6 @@ __revision__ = "$Id$" import os, re import fnmatch -from glob import glob from distutils.util import convert_path from distutils.errors import DistutilsTemplateError, DistutilsInternalError from distutils import log diff --git a/Lib/distutils/tests/test_dist.py b/Lib/distutils/tests/test_dist.py index 23506b5..91acf45 100644 --- a/Lib/distutils/tests/test_dist.py +++ b/Lib/distutils/tests/test_dist.py @@ -3,10 +3,8 @@ import distutils.cmd import distutils.dist import os -import shutil import io import sys -import tempfile import unittest from test.test_support import TESTFN diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py index 770b7c3..d56f7e9 100644 --- a/Lib/distutils/tests/test_sysconfig.py +++ b/Lib/distutils/tests/test_sysconfig.py @@ -2,7 +2,6 @@ from distutils import sysconfig import os -import sys import unittest from test.test_support import TESTFN diff --git a/Lib/distutils/unixccompiler.py b/Lib/distutils/unixccompiler.py index ee975e1..25a042d 100644 --- a/Lib/distutils/unixccompiler.py +++ b/Lib/distutils/unixccompiler.py @@ -16,7 +16,6 @@ the "typical" Unix-style command-line C compiler: __revision__ = "$Id$" import os, sys -from copy import copy from distutils import sysconfig from distutils.dep_util import newer |