added test coverage for distutils.dep_util, and cleaned up the module
diff --git a/Lib/distutils/dep_util.py b/Lib/distutils/dep_util.py
index 39eecfb..4e40df6 100644
--- a/Lib/distutils/dep_util.py
+++ b/Lib/distutils/dep_util.py
@@ -9,29 +9,27 @@
import os
from distutils.errors import DistutilsFileError
+def newer(source, target):
+ """Tells if the target is newer than the source.
-def newer (source, target):
- """Return true if 'source' exists and is more recently modified than
- 'target', or if 'source' exists and 'target' doesn't. Return false if
- both exist and 'target' is the same age or younger than 'source'.
- Raise DistutilsFileError if 'source' does not exist.
+ Return true if 'source' exists and is more recently modified than
+ 'target', or if 'source' exists and 'target' doesn't.
+
+ Return false if both exist and 'target' is the same age or younger
+ than 'source'. Raise DistutilsFileError if 'source' does not exist.
+
+ Note that this test is not very accurate: files created in the same second
+ will have the same "age".
"""
if not os.path.exists(source):
- raise DistutilsFileError, ("file '%s' does not exist" %
- os.path.abspath(source))
+ raise DistutilsFileError("file '%s' does not exist" %
+ os.path.abspath(source))
if not os.path.exists(target):
- return 1
+ return True
- from stat import ST_MTIME
- mtime1 = os.stat(source)[ST_MTIME]
- mtime2 = os.stat(target)[ST_MTIME]
+ return os.stat(source).st_mtime > os.stat(target).st_mtime
- return mtime1 > mtime2
-
-# newer ()
-
-
-def newer_pairwise (sources, targets):
+def newer_pairwise(sources, targets):
"""Walk two filename lists in parallel, testing if each source is newer
than its corresponding target. Return a pair of lists (sources,
targets) where source is newer than target, according to the semantics
@@ -43,19 +41,18 @@
# build a pair of lists (sources, targets) where source is newer
n_sources = []
n_targets = []
- for i in range(len(sources)):
- if newer(sources[i], targets[i]):
- n_sources.append(sources[i])
- n_targets.append(targets[i])
+ for source, target in zip(sources, targets):
+ if newer(source, target):
+ n_sources.append(source)
+ n_targets.append(target)
- return (n_sources, n_targets)
+ return n_sources, n_targets
-# newer_pairwise ()
-
-
-def newer_group (sources, target, missing='error'):
+def newer_group(sources, target, missing='error'):
"""Return true if 'target' is out-of-date with respect to any file
- listed in 'sources'. In other words, if 'target' exists and is newer
+ listed in 'sources'.
+
+ In other words, if 'target' exists and is newer
than every file in 'sources', return false; otherwise return true.
'missing' controls what we do when a source file is missing; the
default ("error") is to blow up with an OSError from inside 'stat()';
@@ -68,14 +65,14 @@
"""
# If the target doesn't even exist, then it's definitely out-of-date.
if not os.path.exists(target):
- return 1
+ return True
# Otherwise we have to find out the hard way: if *any* source file
# is more recent than 'target', then 'target' is out-of-date and
# we can immediately return true. If we fall through to the end
# of the loop, then 'target' is up-to-date and we return false.
- from stat import ST_MTIME
- target_mtime = os.stat(target)[ST_MTIME]
+ target_mtime = os.stat(target).st_mtime
+
for source in sources:
if not os.path.exists(source):
if missing == 'error': # blow up when we stat() the file
@@ -83,12 +80,9 @@
elif missing == 'ignore': # missing source dropped from
continue # target's dependency list
elif missing == 'newer': # missing source means target is
- return 1 # out-of-date
+ return True # out-of-date
- source_mtime = os.stat(source)[ST_MTIME]
- if source_mtime > target_mtime:
- return 1
- else:
- return 0
+ if os.stat(source).st_mtime > target_mtime:
+ return True
-# newer_group ()
+ return False