[Python-checkins] python/dist/src/Lib/distutils archive_util.py,
1.15, 1.16 bcppcompiler.py, 1.16, 1.17 ccompiler.py, 1.58,
1.59 cmd.py, 1.37, 1.38 core.py, 1.60, 1.61 cygwinccompiler.py,
1.25, 1.26 debug.py, 1.2, 1.3 dir_util.py, 1.13, 1.14 dist.py,
1.67, 1.68 file_util.py, 1.15, 1.16 filelist.py, 1.16,
1.17 log.py, 1.4, 1.5 msvccompiler.py, 1.59, 1.60 spawn.py,
1.17, 1.18 sysconfig.py, 1.59, 1.60 unixccompiler.py, 1.54,
1.55 util.py, 1.75, 1.76
tim_one at users.sourceforge.net
tim_one at users.sourceforge.net
Sun Jul 18 08:15:16 CEST 2004
- Previous message: [Python-checkins] python/dist/src/Lib/curses __init__.py, 1.4,
1.5 has_key.py, 1.4, 1.5 panel.py, 1.1, 1.2
- Next message: [Python-checkins] python/dist/src/Lib/distutils/command bdist.py,
1.28, 1.29 bdist_dumb.py, 1.23, 1.24 bdist_wininst.py, 1.49,
1.50 build_ext.py, 1.95, 1.96 build_scripts.py, 1.22,
1.23 install.py, 1.69, 1.70 register.py, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Lib/distutils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31286/distutils
Modified Files:
archive_util.py bcppcompiler.py ccompiler.py cmd.py core.py
cygwinccompiler.py debug.py dir_util.py dist.py file_util.py
filelist.py log.py msvccompiler.py spawn.py sysconfig.py
unixccompiler.py util.py
Log Message:
Whitespace normalization, via reindent.py.
Index: archive_util.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/archive_util.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** archive_util.py 21 Nov 2002 18:33:28 -0000 1.15
--- archive_util.py 18 Jul 2004 06:14:41 -0000 1.16
***************
*** 69,73 ****
except ImportError:
zipfile = None
!
zip_filename = base_name + ".zip"
mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
--- 69,73 ----
except ImportError:
zipfile = None
!
zip_filename = base_name + ".zip"
mkpath(os.path.dirname(zip_filename), dry_run=dry_run)
***************
*** 80,84 ****
else:
zipoptions = "-rq"
!
try:
spawn(["zip", zipoptions, zip_filename, base_dir],
--- 80,84 ----
else:
zipoptions = "-rq"
!
try:
spawn(["zip", zipoptions, zip_filename, base_dir],
Index: bcppcompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/bcppcompiler.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** bcppcompiler.py 5 Dec 2003 20:12:23 -0000 1.16
--- bcppcompiler.py 18 Jul 2004 06:14:42 -0000 1.17
***************
*** 86,90 ****
output_dir=None, macros=None, include_dirs=None, debug=0,
extra_preargs=None, extra_postargs=None, depends=None):
!
macros, objects, extra_postargs, pp_opts, build = \
self._setup_compile(output_dir, macros, include_dirs, sources,
--- 86,90 ----
output_dir=None, macros=None, include_dirs=None, debug=0,
extra_preargs=None, extra_postargs=None, depends=None):
!
macros, objects, extra_postargs, pp_opts, build = \
self._setup_compile(output_dir, macros, include_dirs, sources,
Index: ccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/ccompiler.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -C2 -d -r1.58 -r1.59
*** ccompiler.py 5 Dec 2003 20:12:23 -0000 1.58
--- ccompiler.py 18 Jul 2004 06:14:42 -0000 1.59
***************
*** 686,690 ****
# A concrete compiler class can either override this method
# entirely or implement _compile().
!
macros, objects, extra_postargs, pp_opts, build = \
self._setup_compile(output_dir, macros, include_dirs, sources,
--- 686,690 ----
# A concrete compiler class can either override this method
# entirely or implement _compile().
!
macros, objects, extra_postargs, pp_opts, build = \
self._setup_compile(output_dir, macros, include_dirs, sources,
***************
*** 704,708 ****
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
"""Compile 'src' to product 'obj'."""
!
# A concrete compiler class that does not override compile()
# should implement _compile().
--- 704,708 ----
def _compile(self, obj, src, ext, cc_args, extra_postargs, pp_opts):
"""Compile 'src' to product 'obj'."""
!
# A concrete compiler class that does not override compile()
# should implement _compile().
Index: cmd.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cmd.py,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** cmd.py 18 Jun 2004 21:28:28 -0000 1.37
--- cmd.py 18 Jul 2004 06:14:42 -0000 1.38
***************
*** 80,84 ****
# backwards compatibility (I think)?
self.verbose = dist.verbose
!
# Some commands define a 'self.force' option to ignore file
# timestamps, but methods defined *here* assume that
--- 80,84 ----
# backwards compatibility (I think)?
self.verbose = dist.verbose
!
# Some commands define a 'self.force' option to ignore file
# timestamps, but methods defined *here* assume that
***************
*** 101,105 ****
# XXX A more explicit way to customize dry_run would be better.
!
def __getattr__ (self, attr):
if attr == 'dry_run':
--- 101,105 ----
# XXX A more explicit way to customize dry_run would be better.
!
def __getattr__ (self, attr):
if attr == 'dry_run':
Index: core.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/core.py,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** core.py 22 Mar 2004 22:22:04 -0000 1.60
--- core.py 18 Jul 2004 06:14:42 -0000 1.61
***************
*** 240,242 ****
# run_setup ()
-
--- 240,241 ----
Index: cygwinccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/cygwinccompiler.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** cygwinccompiler.py 5 Jun 2004 18:37:53 -0000 1.25
--- cygwinccompiler.py 18 Jul 2004 06:14:42 -0000 1.26
***************
*** 76,80 ****
if status is not CONFIG_H_OK:
self.warn(
! "Python's pyconfig.h doesn't seem to support your compiler. "
"Reason: %s. "
"Compiling may fail because of undefined preprocessor macros."
--- 76,80 ----
if status is not CONFIG_H_OK:
self.warn(
! "Python's pyconfig.h doesn't seem to support your compiler. "
"Reason: %s. "
"Compiling may fail because of undefined preprocessor macros."
Index: debug.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/debug.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** debug.py 19 Nov 2002 13:12:27 -0000 1.2
--- debug.py 18 Jul 2004 06:14:42 -0000 1.3
***************
*** 8,10 ****
# debug mode.
DEBUG = os.environ.get('DISTUTILS_DEBUG')
-
--- 8,9 ----
Index: dir_util.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dir_util.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dir_util.py 12 Feb 2004 17:35:08 -0000 1.13
--- dir_util.py 18 Jul 2004 06:14:42 -0000 1.14
***************
*** 226,228 ****
path = drive + path[1:]
return path
-
--- 226,227 ----
Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/dist.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -d -r1.67 -r1.68
*** dist.py 11 Jun 2004 21:50:32 -0000 1.67
--- dist.py 18 Jul 2004 06:14:42 -0000 1.68
***************
*** 232,236 ****
attrs['requires'] = newreq
! # Build up the provides object. If the setup() has no
# provides line, we use packages or modules and the version
# to synthesise the provides. If no version is provided (no
--- 232,236 ----
attrs['requires'] = newreq
! # Build up the provides object. If the setup() has no
# provides line, we use packages or modules and the version
# to synthesise the provides. If no version is provided (no
***************
*** 1138,1142 ****
def get_requires(self):
! return [ '%s%s%s'%(x, (y and '-') or '', y or '')
for x,y in self.requires ]
--- 1138,1142 ----
def get_requires(self):
! return [ '%s%s%s'%(x, (y and '-') or '', y or '')
for x,y in self.requires ]
Index: file_util.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/file_util.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** file_util.py 19 Nov 2002 13:12:27 -0000 1.15
--- file_util.py 18 Jul 2004 06:14:42 -0000 1.16
***************
*** 43,47 ****
raise DistutilsFileError, \
"could not delete '%s': %s" % (dst, errstr)
!
try:
fdst = open(dst, 'wb')
--- 43,47 ----
raise DistutilsFileError, \
"could not delete '%s': %s" % (dst, errstr)
!
try:
fdst = open(dst, 'wb')
Index: filelist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/filelist.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** filelist.py 31 May 2004 15:12:27 -0000 1.16
--- filelist.py 18 Jul 2004 06:14:42 -0000 1.17
***************
*** 168,172 ****
if not self.include_pattern(pattern, prefix=dir):
log.warn(("warning: no files found matching '%s' " +
! "under directory '%s'"),
pattern, dir)
--- 168,172 ----
if not self.include_pattern(pattern, prefix=dir):
log.warn(("warning: no files found matching '%s' " +
! "under directory '%s'"),
pattern, dir)
Index: log.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/log.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** log.py 20 Feb 2003 02:09:30 -0000 1.4
--- log.py 18 Jul 2004 06:14:42 -0000 1.5
***************
*** 29,42 ****
def debug(self, msg, *args):
self._log(DEBUG, msg, args)
!
def info(self, msg, *args):
self._log(INFO, msg, args)
!
def warn(self, msg, *args):
self._log(WARN, msg, args)
!
def error(self, msg, *args):
self._log(ERROR, msg, args)
!
def fatal(self, msg, *args):
self._log(FATAL, msg, args)
--- 29,42 ----
def debug(self, msg, *args):
self._log(DEBUG, msg, args)
!
def info(self, msg, *args):
self._log(INFO, msg, args)
!
def warn(self, msg, *args):
self._log(WARN, msg, args)
!
def error(self, msg, *args):
self._log(ERROR, msg, args)
!
def fatal(self, msg, *args):
self._log(FATAL, msg, args)
Index: msvccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/msvccompiler.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** msvccompiler.py 5 Dec 2003 20:12:23 -0000 1.59
--- msvccompiler.py 18 Jul 2004 06:14:42 -0000 1.60
***************
*** 118,122 ****
self.macros["$(%s)" % macro] = d[key]
break
!
def load_macros(self, version):
vsbase = r"Software\Microsoft\VisualStudio\%0.1f" % version
--- 118,122 ----
self.macros["$(%s)" % macro] = d[key]
break
!
def load_macros(self, version):
vsbase = r"Software\Microsoft\VisualStudio\%0.1f" % version
***************
*** 167,171 ****
# else we don't know what version of the compiler this is
return None
!
class MSVCCompiler (CCompiler) :
--- 167,171 ----
# else we don't know what version of the compiler this is
return None
!
class MSVCCompiler (CCompiler) :
***************
*** 526,530 ****
return exe
!
def get_msvc_paths(self, path, platform='x86'):
"""Get a list of devstudio directories (include, lib or path).
--- 526,530 ----
return exe
!
def get_msvc_paths(self, path, platform='x86'):
"""Get a list of devstudio directories (include, lib or path).
***************
*** 577,579 ****
if p:
os.environ[name] = string.join(p, ';')
-
--- 577,578 ----
Index: spawn.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/spawn.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** spawn.py 24 Feb 2004 23:54:17 -0000 1.17
--- spawn.py 18 Jul 2004 06:14:42 -0000 1.18
***************
*** 98,102 ****
if search_path:
# either we find one or it stays the same
! executable = find_executable(executable) or executable
log.info(string.join([executable] + cmd[1:], ' '))
if not dry_run:
--- 98,102 ----
if search_path:
# either we find one or it stays the same
! executable = find_executable(executable) or executable
log.info(string.join([executable] + cmd[1:], ' '))
if not dry_run:
Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -C2 -d -r1.59 -r1.60
*** sysconfig.py 3 Jun 2004 12:41:45 -0000 1.59
--- sysconfig.py 18 Jul 2004 06:14:42 -0000 1.60
***************
*** 368,372 ****
% (cur_target, cfg_target))
raise DistutilsPlatformError(my_msg)
!
# On AIX, there are wrong paths to the linker scripts in the Makefile
# -- these paths are relative to the Python source, but when installed
--- 368,372 ----
% (cur_target, cfg_target))
raise DistutilsPlatformError(my_msg)
!
# On AIX, there are wrong paths to the linker scripts in the Makefile
# -- these paths are relative to the Python source, but when installed
Index: unixccompiler.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/unixccompiler.py,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** unixccompiler.py 1 Jun 2003 19:27:40 -0000 1.54
--- unixccompiler.py 18 Jul 2004 06:14:42 -0000 1.55
***************
*** 207,211 ****
return "+s -L" + dir
elif compiler[:3] == "gcc" or compiler[:3] == "g++":
! return "-Wl,-R" + dir
else:
return "-R" + dir
--- 207,211 ----
return "+s -L" + dir
elif compiler[:3] == "gcc" or compiler[:3] == "g++":
! return "-Wl,-R" + dir
else:
return "-R" + dir
***************
*** 218,222 ****
dylib_f = self.library_filename(lib, lib_type='dylib')
static_f = self.library_filename(lib, lib_type='static')
!
for dir in dirs:
shared = os.path.join(dir, shared_f)
--- 218,222 ----
dylib_f = self.library_filename(lib, lib_type='dylib')
static_f = self.library_filename(lib, lib_type='static')
!
for dir in dirs:
shared = os.path.join(dir, shared_f)
***************
*** 233,237 ****
elif os.path.exists(static):
return static
!
# Oops, didn't find it in *any* of 'dirs'
return None
--- 233,237 ----
elif os.path.exists(static):
return static
!
# Oops, didn't find it in *any* of 'dirs'
return None
Index: util.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/util.py,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** util.py 25 Mar 2004 14:58:19 -0000 1.75
--- util.py 18 Jul 2004 06:14:42 -0000 1.76
***************
*** 301,305 ****
def strtobool (val):
"""Convert a string representation of truth to true (1) or false (0).
!
True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if
--- 301,305 ----
def strtobool (val):
"""Convert a string representation of truth to true (1) or false (0).
!
True values are 'y', 'yes', 't', 'true', 'on', and '1'; false values
are 'n', 'no', 'f', 'false', 'off', and '0'. Raises ValueError if
- Previous message: [Python-checkins] python/dist/src/Lib/curses __init__.py, 1.4,
1.5 has_key.py, 1.4, 1.5 panel.py, 1.1, 1.2
- Next message: [Python-checkins] python/dist/src/Lib/distutils/command bdist.py,
1.28, 1.29 bdist_dumb.py, 1.23, 1.24 bdist_wininst.py, 1.49,
1.50 build_ext.py, 1.95, 1.96 build_scripts.py, 1.22,
1.23 install.py, 1.69, 1.70 register.py, 1.6, 1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Python-checkins
mailing list