summaryrefslogtreecommitdiff
path: root/src/distutils2/command
diff options
context:
space:
mode:
Diffstat (limited to 'src/distutils2/command')
-rw-r--r--src/distutils2/command/build_ext.py2
-rw-r--r--src/distutils2/command/build_scripts.py3
-rw-r--r--src/distutils2/command/sdist.py10
3 files changed, 7 insertions, 8 deletions
diff --git a/src/distutils2/command/build_ext.py b/src/distutils2/command/build_ext.py
index 126c6f8..ae11330 100644
--- a/src/distutils2/command/build_ext.py
+++ b/src/distutils2/command/build_ext.py
@@ -13,7 +13,7 @@ from distutils2.util import get_platform
from distutils2.core import Command
from distutils2.errors import *
from distutils2.compiler.ccompiler import customize_compiler
-from distutils2.dep_util import newer_group
+from distutils2.util import newer_group
from distutils2.extension import Extension
from distutils2 import log
try:
diff --git a/src/distutils2/command/build_scripts.py b/src/distutils2/command/build_scripts.py
index 7a95827..ad1c234 100644
--- a/src/distutils2/command/build_scripts.py
+++ b/src/distutils2/command/build_scripts.py
@@ -7,8 +7,7 @@ __revision__ = "$Id: build_scripts.py 77704 2010-01-23 09:23:15Z tarek.ziade $"
import os, re
from stat import ST_MODE
from distutils2.core import Command
-from distutils2.dep_util import newer
-from distutils2.util import convert_path
+from distutils2.util import convert_path, newer
from distutils2 import log
try:
import sysconfig
diff --git a/src/distutils2/command/sdist.py b/src/distutils2/command/sdist.py
index 31a8ae6..9a3ee7f 100644
--- a/src/distutils2/command/sdist.py
+++ b/src/distutils2/command/sdist.py
@@ -16,13 +16,13 @@ except ImportError:
from distutils2._backport.shutil import get_archive_formats
from distutils2.core import Command
-from distutils2 import dep_util, file_util
+from distutils2 import file_util
from distutils2.text_file import TextFile
from distutils2.errors import (DistutilsPlatformError, DistutilsOptionError,
DistutilsTemplateError)
from distutils2.filelist import FileList
from distutils2 import log
-from distutils2.util import convert_path
+from distutils2.util import convert_path, newer
def show_formats():
"""Print all possible values for the 'formats' option (used by
@@ -195,7 +195,7 @@ class sdist(Command):
# manifest; if so, we'll regenerate the manifest.
template_exists = os.path.isfile(self.template)
if template_exists:
- template_newer = dep_util.newer(self.template, self.manifest)
+ template_newer = newer(self.template, self.manifest)
# The contents of the manifest file almost certainly depend on the
# setup script as well as the manifest template -- so if the setup
@@ -206,8 +206,8 @@ class sdist(Command):
# can't regenerate the manifest, so we don't.)
self.debug_print("checking if %s newer than %s" %
(self.distribution.script_name, self.manifest))
- setup_newer = dep_util.newer(self.distribution.script_name,
- self.manifest)
+ setup_newer = newer(self.distribution.script_name,
+ self.manifest)
# cases:
# 1) no manifest, template exists: generate manifest