[Python-checkins] r74495 - python/trunk/Lib/distutils/filelist.py
tarek.ziade
python-checkins at python.org
Mon Aug 17 23:48:22 CEST 2009
Author: tarek.ziade
Date: Mon Aug 17 23:48:22 2009
New Revision: 74495
Log:
module cleanup
Modified:
python/trunk/Lib/distutils/filelist.py
Modified: python/trunk/Lib/distutils/filelist.py
==============================================================================
--- python/trunk/Lib/distutils/filelist.py (original)
+++ python/trunk/Lib/distutils/filelist.py Mon Aug 17 23:48:22 2009
@@ -6,15 +6,13 @@
__revision__ = "$Id$"
-import os, string, re
+import os, re
import fnmatch
-from types import *
from distutils.util import convert_path
from distutils.errors import DistutilsTemplateError, DistutilsInternalError
from distutils import log
class FileList:
-
"""A list of files built by on exploring the filesystem and filtered by
applying various patterns to what we find there.
@@ -29,22 +27,19 @@
filtering applied)
"""
- def __init__(self,
- warn=None,
- debug_print=None):
+ def __init__(self, warn=None, debug_print=None):
# ignore argument to FileList, but keep them for backwards
# compatibility
-
self.allfiles = None
self.files = []
- def set_allfiles (self, allfiles):
+ def set_allfiles(self, allfiles):
self.allfiles = allfiles
- def findall (self, dir=os.curdir):
+ def findall(self, dir=os.curdir):
self.allfiles = findall(dir)
- def debug_print (self, msg):
+ def debug_print(self, msg):
"""Print 'msg' to stdout if the global DEBUG (taken from the
DISTUTILS_DEBUG environment variable) flag is true.
"""
@@ -54,13 +49,13 @@
# -- List-like methods ---------------------------------------------
- def append (self, item):
+ def append(self, item):
self.files.append(item)
- def extend (self, items):
+ def extend(self, items):
self.files.extend(items)
- def sort (self):
+ def sort(self):
# Not a strict lexical sort!
sortable_files = map(os.path.split, self.files)
sortable_files.sort()
@@ -71,7 +66,7 @@
# -- Other miscellaneous utility methods ---------------------------
- def remove_duplicates (self):
+ def remove_duplicates(self):
# Assumes list has been sorted!
for i in range(len(self.files) - 1, 0, -1):
if self.files[i] == self.files[i - 1]:
@@ -80,8 +75,8 @@
# -- "File template" methods ---------------------------------------
- def _parse_template_line (self, line):
- words = string.split(line)
+ def _parse_template_line(self, line):
+ words = line.split()
action = words[0]
patterns = dir = dir_pattern = None
@@ -114,11 +109,7 @@
return (action, patterns, dir, dir_pattern)
- # _parse_template_line ()
-
-
- def process_template_line (self, line):
-
+ def process_template_line(self, line):
# Parse the line: split it up, make sure the right number of words
# is there, and return the relevant words. 'action' is always
# defined: it's the first word of the line. Which of the other
@@ -130,28 +121,28 @@
# right number of words on the line for that action -- so we
# can proceed with minimal error-checking.
if action == 'include':
- self.debug_print("include " + string.join(patterns))
+ self.debug_print("include " + ' '.join(patterns))
for pattern in patterns:
if not self.include_pattern(pattern, anchor=1):
log.warn("warning: no files found matching '%s'",
pattern)
elif action == 'exclude':
- self.debug_print("exclude " + string.join(patterns))
+ self.debug_print("exclude " + ' '.join(patterns))
for pattern in patterns:
if not self.exclude_pattern(pattern, anchor=1):
log.warn(("warning: no previously-included files "
"found matching '%s'"), pattern)
elif action == 'global-include':
- self.debug_print("global-include " + string.join(patterns))
+ self.debug_print("global-include " + ' '.join(patterns))
for pattern in patterns:
if not self.include_pattern(pattern, anchor=0):
log.warn(("warning: no files found matching '%s' " +
"anywhere in distribution"), pattern)
elif action == 'global-exclude':
- self.debug_print("global-exclude " + string.join(patterns))
+ self.debug_print("global-exclude " + ' '.join(patterns))
for pattern in patterns:
if not self.exclude_pattern(pattern, anchor=0):
log.warn(("warning: no previously-included files matching "
@@ -160,7 +151,7 @@
elif action == 'recursive-include':
self.debug_print("recursive-include %s %s" %
- (dir, string.join(patterns)))
+ (dir, ' '.join(patterns)))
for pattern in patterns:
if not self.include_pattern(pattern, prefix=dir):
log.warn(("warning: no files found matching '%s' " +
@@ -169,7 +160,7 @@
elif action == 'recursive-exclude':
self.debug_print("recursive-exclude %s %s" %
- (dir, string.join(patterns)))
+ (dir, ' '.join(patterns)))
for pattern in patterns:
if not self.exclude_pattern(pattern, prefix=dir):
log.warn(("warning: no previously-included files matching "
@@ -196,13 +187,13 @@
# -- Filtering/selection methods -----------------------------------
- def include_pattern (self, pattern,
- anchor=1, prefix=None, is_regex=0):
+ def include_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
"""Select strings (presumably filenames) from 'self.files' that
- match 'pattern', a Unix-style wildcard (glob) pattern. Patterns
- are not quite the same as implemented by the 'fnmatch' module: '*'
- and '?' match non-special characters, where "special" is platform-
- dependent: slash on Unix; colon, slash, and backslash on
+ match 'pattern', a Unix-style wildcard (glob) pattern.
+
+ Patterns are not quite the same as implemented by the 'fnmatch'
+ module: '*' and '?' match non-special characters, where "special"
+ is platform-dependent: slash on Unix; colon, slash, and backslash on
DOS/Windows; and colon on Mac OS.
If 'anchor' is true (the default), then the pattern match is more
@@ -239,16 +230,14 @@
return files_found
- # include_pattern ()
-
- def exclude_pattern (self, pattern,
- anchor=1, prefix=None, is_regex=0):
+ def exclude_pattern(self, pattern, anchor=1, prefix=None, is_regex=0):
"""Remove strings (presumably filenames) from 'files' that match
- 'pattern'. Other parameters are the same as for
- 'include_pattern()', above.
- The list 'self.files' is modified in place.
- Return 1 if files are found.
+ 'pattern'.
+
+ Other parameters are the same as for 'include_pattern()', above.
+ The list 'self.files' is modified in place. Return 1 if files are
+ found.
"""
files_found = 0
pattern_re = translate_pattern(pattern, anchor, prefix, is_regex)
@@ -262,15 +251,11 @@
return files_found
- # exclude_pattern ()
-
-# class FileList
-
# ----------------------------------------------------------------------
# Utility functions
-def findall (dir = os.curdir):
+def findall(dir = os.curdir):
"""Find all files under 'dir' and return the list of full filenames
(relative to 'dir').
"""
@@ -303,10 +288,11 @@
def glob_to_re(pattern):
- """Translate a shell-like glob pattern to a regular expression; return
- a string containing the regex. Differs from 'fnmatch.translate()' in
- that '*' does not match "special characters" (which are
- platform-specific).
+ """Translate a shell-like glob pattern to a regular expression.
+
+ Return a string containing the regex. Differs from
+ 'fnmatch.translate()' in that '*' does not match "special characters"
+ (which are platform-specific).
"""
pattern_re = fnmatch.translate(pattern)
@@ -321,17 +307,17 @@
return pattern_re
-# glob_to_re ()
-
-def translate_pattern (pattern, anchor=1, prefix=None, is_regex=0):
+def translate_pattern(pattern, anchor=1, prefix=None, is_regex=0):
"""Translate a shell-like wildcard pattern to a compiled regular
- expression. Return the compiled regex. If 'is_regex' true,
+ expression.
+
+ Return the compiled regex. If 'is_regex' true,
then 'pattern' is directly compiled to a regex (if it's a string)
or just returned as-is (assumes it's a regex object).
"""
if is_regex:
- if type(pattern) is StringType:
+ if isinstance(pattern, str):
return re.compile(pattern)
else:
return pattern
@@ -344,11 +330,10 @@
if prefix is not None:
# ditch end of pattern character
empty_pattern = glob_to_re('')
- prefix_re = (glob_to_re(prefix))[:-len(empty_pattern)]
+ prefix_re = glob_to_re(prefix)[:-len(empty_pattern)]
pattern_re = "^" + os.path.join(prefix_re, ".*" + pattern_re)
else: # no prefix -- respect anchor flag
if anchor:
pattern_re = "^" + pattern_re
return re.compile(pattern_re)
-# translate_pattern ()
More information about the Python-checkins
mailing list