[Python-checkins] distutils2: Merged with tarek
tarek.ziade
python-checkins at python.org
Sun Aug 8 11:50:46 CEST 2010
tarek.ziade pushed dd1db781cb58 to distutils2:
http://hg.python.org/distutils2/rev/dd1db781cb58
changeset: 431:dd1db781cb58
parent: 430:59a04405c5af
parent: 382:733c3bdaa25e
user: Josip Djolonga
date: Sun Jul 18 04:13:53 2010 +0200
summary: Merged with tarek
files:
diff --git a/src/distutils2/command/bdist_dumb.py b/src/distutils2/command/bdist_dumb.py
--- a/src/distutils2/command/bdist_dumb.py
+++ b/src/distutils2/command/bdist_dumb.py
@@ -115,8 +115,9 @@
% (repr(install.install_base),
repr(install.install_platbase)))
else:
- archive_root = os.path.join(self.bdist_dir,
- ensure_relative(install.install_base))
+ archive_root = os.path.join(
+ self.bdist_dir,
+ self._ensure_relative(install.install_base))
# Make the archive
filename = self.make_archive(pseudoinstall_root,
@@ -135,3 +136,9 @@
else:
rmtree(self.bdist_dir)
+ def _ensure_relative(self, path):
+ # copied from dir_util, deleted
+ drive, path = os.path.splitdrive(path)
+ if path[0:1] == os.sep:
+ path = drive + path[1:]
+ return path
diff --git a/src/distutils2/command/bdist_wininst.py b/src/distutils2/command/bdist_wininst.py
--- a/src/distutils2/command/bdist_wininst.py
+++ b/src/distutils2/command/bdist_wininst.py
@@ -8,6 +8,7 @@
import sys
import os
import string
+from shutil import rmtree
try:
from sysconfig import get_python_version
except ImportError:
diff --git a/src/distutils2/command/build_py.py b/src/distutils2/command/build_py.py
--- a/src/distutils2/command/build_py.py
+++ b/src/distutils2/command/build_py.py
@@ -9,6 +9,7 @@
import logging
from glob import glob
+import distutils2
from distutils2.core import Command
from distutils2.errors import DistutilsOptionError, DistutilsFileError
from distutils2.util import convert_path
diff --git a/src/distutils2/command/cmd.py b/src/distutils2/command/cmd.py
--- a/src/distutils2/command/cmd.py
+++ b/src/distutils2/command/cmd.py
@@ -6,7 +6,7 @@
__revision__ = "$Id: cmd.py 75192 2009-10-02 23:49:48Z tarek.ziade $"
-import sys, os, re
+import os, re
from distutils2.errors import DistutilsOptionError
from distutils2 import util
from distutils2 import log
@@ -447,7 +447,7 @@
# If 'outfile' must be regenerated (either because it doesn't
# exist, is out-of-date, or the 'force' flag is true) then
# perform the action that presumably regenerates it
- if self.force or dep_util.newer_group(infiles, outfile):
+ if self.force or util.newer_group(infiles, outfile):
self.execute(func, args, exec_msg, level)
# Otherwise, print the "skip" message
diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -18,12 +18,11 @@
from distutils2._backport.shutil import get_archive_formats
from distutils2.core import Command
-from distutils2 import util
from distutils2.errors import (DistutilsPlatformError, DistutilsOptionError,
DistutilsTemplateError)
from distutils2.manifest import Manifest
from distutils2 import log
-from distutils2.util import convert_path, newer
+from distutils2.util import convert_path
def show_formats():
"""Print all possible values for the 'formats' option (used by
diff --git a/src/distutils2/command/upload_docs.py b/src/distutils2/command/upload_docs.py
--- a/src/distutils2/command/upload_docs.py
+++ b/src/distutils2/command/upload_docs.py
@@ -1,4 +1,4 @@
-import base64, httplib, os.path, socket, tempfile, urlparse, zipfile
+import base64, httplib, os.path, socket, urlparse, zipfile
from cStringIO import StringIO
from distutils2 import log
from distutils2.command.upload import upload
@@ -81,7 +81,6 @@
raise DistutilsFileError(mesg % upload_dir)
def run(self):
- tmp_dir = tempfile.mkdtemp()
name = self.distribution.metadata['Name']
zip_file = zip_dir(self.upload_dir)
@@ -124,7 +123,7 @@
elif r.status == 301:
location = r.getheader('Location')
if location is None:
- location = 'http://packages.python.org/%s/' % meta.get_name()
+ location = 'http://packages.python.org/%s/' % name
self.announce('Upload successful. Visit %s' % location,
log.INFO)
else:
diff --git a/src/distutils2/extension.py b/src/distutils2/extension.py
--- a/src/distutils2/extension.py
+++ b/src/distutils2/extension.py
@@ -5,14 +5,8 @@
__revision__ = "$Id: extension.py 77704 2010-01-23 09:23:15Z tarek.ziade $"
-import os
import warnings
-try:
- import sysconfig
-except ImportError:
- from distutils2._backport import sysconfig
-
# This class is really only used by the "build_ext" command, so it might
# make sense to put it in distutils.command.build_ext. However, that
# module is already big enough, and I want to make this class a bit more
diff --git a/src/distutils2/tests/test_build_ext.py b/src/distutils2/tests/test_build_ext.py
--- a/src/distutils2/tests/test_build_ext.py
+++ b/src/distutils2/tests/test_build_ext.py
@@ -368,4 +368,4 @@
else: return unittest.makeSuite(BuildExtTestCase)
if __name__ == '__main__':
- distsutils2.tests.run_unittest(test_suite())
+ distutils2.tests.run_unittest(test_suite())
diff --git a/src/distutils2/tests/test_depgraph.py b/src/distutils2/tests/test_depgraph.py
--- a/src/distutils2/tests/test_depgraph.py
+++ b/src/distutils2/tests/test_depgraph.py
@@ -10,7 +10,7 @@
import re
try:
import cStringIO as StringIO
-except ImportErorr:
+except ImportError:
import StringIO
class DepGraphTestCase(support.LoggingSilencer,
diff --git a/src/distutils2/tests/test_manifest.py b/src/distutils2/tests/test_manifest.py
--- a/src/distutils2/tests/test_manifest.py
+++ b/src/distutils2/tests/test_manifest.py
@@ -3,6 +3,7 @@
import sys
import logging
+from distutils2.tests import run_unittest
from distutils2.tests import support
from distutils2.tests.support import unittest
from distutils2.manifest import Manifest
diff --git a/src/distutils2/tests/test_metadata.py b/src/distutils2/tests/test_metadata.py
--- a/src/distutils2/tests/test_metadata.py
+++ b/src/distutils2/tests/test_metadata.py
@@ -5,6 +5,7 @@
from distutils2.metadata import (DistributionMetadata, _interpret,
PKG_INFO_PREFERRED_VERSION)
+from distutils2.tests import run_unittest
from distutils2.tests.support import unittest, LoggingSilencer
from distutils2.errors import (MetadataConflictError,
MetadataUnrecognizedVersionError)
diff --git a/src/distutils2/tests/test_pypi_versions.py b/src/distutils2/tests/test_pypi_versions.py
--- a/src/distutils2/tests/test_pypi_versions.py
+++ b/src/distutils2/tests/test_pypi_versions.py
@@ -19,6 +19,7 @@
import os.path
from distutils2.version import suggest_normalized_version
+from distutils2.tests import run_unittest
from distutils2.tests.support import unittest
def test_pypi():
@@ -52,7 +53,7 @@
print "Saving package info..."
f = open(INDEX_PICKLE_FILE, 'wb')
try:
- pickle.dump(package_info, o)
+ pickle.dump(package_info, f)
finally:
f.close()
diff --git a/src/distutils2/version.py b/src/distutils2/version.py
--- a/src/distutils2/version.py
+++ b/src/distutils2/version.py
@@ -1,4 +1,3 @@
-import sys
import re
from distutils2.errors import IrrationalVersionError, HugeMajorVersionNumError
diff --git a/src/runtests-cov.py b/src/runtests-cov.py
--- a/src/runtests-cov.py
+++ b/src/runtests-cov.py
@@ -23,16 +23,16 @@
return dirnames
def parse_opts():
- parser = OptionParser(usage="%prog [OPTIONS]",
+ parser = OptionParser(usage="%prog [OPTIONS]",
description="run the distutils2 unittests")
- parser.add_option("-q", "--quiet", help="do not print verbose messages",
+ parser.add_option("-q", "--quiet", help="do not print verbose messages",
action="store_true", default=False)
parser.add_option("-c", "--coverage", action="store_true", default=False,
help="produce a coverage report at the end of the run")
parser.add_option("-r", "--report", action="store_true", default=False,
help="produce a coverage report from the last test run")
- parser.add_option("-m", "--show-missing", action="store_true",
+ parser.add_option("-m", "--show-missing", action="store_true",
default=False,
help=("Show line numbers of statements in each module "
"that weren't executed."))
@@ -42,12 +42,12 @@
def coverage_report(opts):
import coverage
- import unittest2
+ from distutils2.tests.support import unittest
cov = coverage.coverage()
cov.load()
prefixes = ["runtests", "distutils2/tests", "distutils2/_backport"]
- prefixes += ignore_prefixes(unittest2)
+ prefixes += ignore_prefixes(unittest)
try:
import docutils
@@ -70,10 +70,10 @@
opts, args = parse_opts()
verbose = not opts.quiet
ret = 0
-
+
if opts.coverage or opts.report:
import coverage
-
+
if opts.coverage:
cov = coverage.coverage()
cov.erase()
@@ -86,9 +86,9 @@
if opts.report or opts.coverage:
coverage_report(opts)
-
+
return ret
-
+
def run_tests(verbose):
import distutils2.tests
from distutils2.tests import run_unittest, reap_children, TestFailed
diff --git a/src/setup.py b/src/setup.py
--- a/src/setup.py
+++ b/src/setup.py
@@ -11,7 +11,6 @@
from distutils2.compiler.ccompiler import new_compiler
from distutils2.command.sdist import sdist
from distutils2.command.install import install
-from distutils2 import __version__ as VERSION
from distutils2.util import find_packages
f = open('README.txt')
--
Repository URL: http://hg.python.org/distutils2
More information about the Python-checkins
mailing list