diff options
| author | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-01-04 10:43:32 (GMT) |
|---|---|---|
| committer | Tarek Ziadé <ziade.tarek@gmail.com> | 2009-01-04 10:43:32 (GMT) |
| commit | 2e1599977354d75159449d309b63bae7269813f5 (patch) | |
| tree | 32cb5175053f16f00023e25d1d933a7afe336dd7 | |
| parent | 653cb62cd6824e749388ef240f3436a560fa1c85 (diff) | |
| download | cpython-2e1599977354d75159449d309b63bae7269813f5.zip cpython-2e1599977354d75159449d309b63bae7269813f5.tar.gz cpython-2e1599977354d75159449d309b63bae7269813f5.tar.bz2 | |
Merged revisions 68293 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r68293 | tarek.ziade | 2009-01-04 11:37:52 +0100 (Sun, 04 Jan 2009) | 1 line
using clearer syntax
........
| -rw-r--r-- | Lib/distutils/command/sdist.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Lib/distutils/command/sdist.py b/Lib/distutils/command/sdist.py index e10e25b..27883fd6 100644 --- a/Lib/distutils/command/sdist.py +++ b/Lib/distutils/command/sdist.py @@ -358,8 +358,13 @@ class sdist (Command): # pruning out vcs directories # both separators are used under win32 - seps = sys.platform == 'win32' and r'/|\\' or '/' - vcs_dirs = ['RCS', 'CVS', '\.svn', '\.hg', '\.git', '\.bzr', '_darcs'] + if sys.platform == 'win32': + seps = r'/|\\' + else: + seps = '/' + + vcs_dirs = ['RCS', 'CVS', r'\.svn', r'\.hg', r'\.git', r'\.bzr', + '_darcs'] vcs_ptrn = r'(^|%s)(%s)(%s).*' % (seps, '|'.join(vcs_dirs), seps) self.filelist.exclude_pattern(vcs_ptrn, is_regex=1) |