[Python-checkins] CVS: distutils/distutils/command bdist_dumb.py,1.9,1.10 bdist_rpm.py,1.14,1.15 bdist_wininst.py,1.4,1.5 clean.py,1.7,1.8 install.py,1.39,1.40 install_lib.py,1.26,1.27 sdist.py,1.41,1.42
Greg Ward
python-dev@python.org
Fri, 4 Aug 2000 18:31:57 -0700
Update of /cvsroot/python/distutils/distutils/command
In directory slayer.i.sourceforge.net:/tmp/cvs-serv5498/command
Modified Files:
bdist_dumb.py bdist_rpm.py bdist_wininst.py clean.py
install.py install_lib.py sdist.py
Log Message:
Fixed imports from '*util' modules to not just import everything from util.
Index: bdist_dumb.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_dumb.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** bdist_dumb.py 2000/07/05 03:07:37 1.9
--- bdist_dumb.py 2000/08/05 01:31:54 1.10
***************
*** 11,15 ****
import os
from distutils.core import Command
! from distutils.util import get_platform, create_tree, remove_tree
from distutils.errors import *
--- 11,16 ----
import os
from distutils.core import Command
! from distutils.util import get_platform
! from distutils.dir_util import create_tree, remove_tree
from distutils.errors import *
Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_rpm.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** bdist_rpm.py 2000/07/27 02:13:20 1.14
--- bdist_rpm.py 2000/08/05 01:31:54 1.15
***************
*** 11,15 ****
from types import *
from distutils.core import Command, DEBUG
! from distutils.util import get_platform, write_file
from distutils.errors import *
--- 11,16 ----
from types import *
from distutils.core import Command, DEBUG
! from distutils.util import get_platform
! from distutils.file_util import write_file
from distutils.errors import *
Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/bdist_wininst.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** bdist_wininst.py 2000/07/05 03:08:55 1.4
--- bdist_wininst.py 2000/08/05 01:31:54 1.5
***************
*** 10,14 ****
import sys, os, string
from distutils.core import Command
! from distutils.util import get_platform, create_tree, remove_tree
from distutils.errors import *
--- 10,15 ----
import sys, os, string
from distutils.core import Command
! from distutils.util import get_platform
! from distutils.dir_util import create_tree, remove_tree
from distutils.errors import *
Index: clean.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/clean.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** clean.py 2000/05/28 23:47:00 1.7
--- clean.py 2000/08/05 01:31:54 1.8
***************
*** 9,13 ****
import os
from distutils.core import Command
! from distutils.util import remove_tree
class clean (Command):
--- 9,13 ----
import os
from distutils.core import Command
! from distutils.dir_util import remove_tree
class clean (Command):
Index: install.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** install.py 2000/06/24 17:22:39 1.39
--- install.py 2000/08/05 01:31:54 1.40
***************
*** 11,15 ****
from distutils.core import Command, DEBUG
from distutils import sysconfig
! from distutils.util import write_file, convert_path, subst_vars, change_root
from distutils.errors import DistutilsOptionError
from glob import glob
--- 11,16 ----
from distutils.core import Command, DEBUG
from distutils import sysconfig
! 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
Index: install_lib.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/install_lib.py,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** install_lib.py 2000/08/02 01:34:18 1.26
--- install_lib.py 2000/08/05 01:31:54 1.27
***************
*** 5,9 ****
import sys, os, string
from distutils.core import Command
! from distutils.util import copy_tree
class install_lib (Command):
--- 5,9 ----
import sys, os, string
from distutils.core import Command
! from distutils.dir_util import copy_tree
class install_lib (Command):
Index: sdist.py
===================================================================
RCS file: /cvsroot/python/distutils/distutils/command/sdist.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** sdist.py 2000/07/30 01:47:16 1.41
--- sdist.py 2000/08/05 01:31:54 1.42
***************
*** 11,17 ****
from glob import glob
from distutils.core import Command
! from distutils.util import \
! create_tree, remove_tree, newer, write_file, \
! check_archive_formats
from distutils.text_file import TextFile
from distutils.errors import *
--- 11,15 ----
from glob import glob
from distutils.core import Command
! from distutils import dir_util, dep_util, file_util, archive_util
from distutils.text_file import TextFile
from distutils.errors import *
***************
*** 118,122 ****
"on platform %s" % os.name
! bad_format = check_archive_formats (self.formats)
if bad_format:
raise DistutilsOptionError, \
--- 116,120 ----
"on platform %s" % os.name
! bad_format = archive_util.check_archive_formats (self.formats)
if bad_format:
raise DistutilsOptionError, \
***************
*** 196,200 ****
template_exists = os.path.isfile(self.template)
if template_exists:
! template_newer = newer(self.template, self.manifest)
# The contents of the manifest file almost certainly depend on the
--- 194,198 ----
template_exists = os.path.isfile(self.template)
if template_exists:
! template_newer = dep_util.newer(self.template, self.manifest)
# The contents of the manifest file almost certainly depend on the
***************
*** 205,209 ****
# developer elects to generate a manifest some other way -- then we
# can't regenerate the manifest, so we don't.)
! setup_newer = newer(sys.argv[0], self.manifest)
# cases:
--- 203,207 ----
# developer elects to generate a manifest some other way -- then we
# can't regenerate the manifest, so we don't.)
! setup_newer = dep_util.newer(sys.argv[0], self.manifest)
# cases:
***************
*** 369,373 ****
named by 'self.manifest'.
"""
! self.execute(write_file,
(self.manifest, self.filelist.files),
"writing manifest file '%s'" % self.manifest)
--- 367,371 ----
named by 'self.manifest'.
"""
! self.execute(file_util.write_file,
(self.manifest, self.filelist.files),
"writing manifest file '%s'" % self.manifest)
***************
*** 405,410 ****
# Create all the directories under 'base_dir' necessary to
# put 'files' there.
! create_tree (base_dir, files,
! verbose=self.verbose, dry_run=self.dry_run)
# And walk over the list of files, either making a hard link (if
--- 403,408 ----
# Create all the directories under 'base_dir' necessary to
# put 'files' there.
! dir_util.create_tree (base_dir, files,
! verbose=self.verbose, dry_run=self.dry_run)
# And walk over the list of files, either making a hard link (if
***************
*** 454,458 ****
if not self.keep_tree:
! remove_tree (base_dir, self.verbose, self.dry_run)
def get_archive_files (self):
--- 452,456 ----
if not self.keep_tree:
! dir_util.remove_tree (base_dir, self.verbose, self.dry_run)
def get_archive_files (self):