diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-02-05 19:11:11 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-02-05 19:11:11 -0500 |
| commit | 6f15ba031a6ad3295ae21caa84f725a49f479b9a (patch) | |
| tree | 1d449168fe6e10b7aae9502402f88e1afb17adc0 | |
| parent | a61674f1324778f8b231c569325eab60e0e78482 (diff) | |
| parent | d505855a1a59213b8a02d50870305c62c52d8399 (diff) | |
| download | external_python_setuptools-6f15ba031a6ad3295ae21caa84f725a49f479b9a.tar.gz external_python_setuptools-6f15ba031a6ad3295ae21caa84f725a49f479b9a.tar.bz2 external_python_setuptools-6f15ba031a6ad3295ae21caa84f725a49f479b9a.zip | |
Merge fix with master
| -rw-r--r-- | CHANGES.txt | 7 | ||||
| -rwxr-xr-x | setuptools/command/sdist.py | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index a76a147b..dbe33d0a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,13 @@ CHANGES ======= +----- +2.1.1 +----- + +* Issue #139: Fix regression in re_finder for CVS repos (and maybe Git repos + as well). + --- 2.1 --- diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index b59cc390..04cbccdf 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -40,7 +40,7 @@ class re_finder(object): path = self.postproc(path) yield svn_utils.joinpath(dirname,path) - def __call__(self, dirname=''): + def find(self, dirname=''): path = svn_utils.joinpath(dirname, self.path) if os.path.isfile(path): @@ -50,6 +50,7 @@ class re_finder(object): elif os.path.isdir(path): for item in self.find(path): yield item + __call__ = find def _default_revctrl(dirname=''): |