diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-24 17:01:49 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-11-24 17:01:49 -0500 |
| commit | 9121e19a1f3923456855f816d1ec7385d33aa018 (patch) | |
| tree | e65683d17d04bada91ffd69c6f4285d1fa3f440e /setuptools/svn_utils.py | |
| parent | 8c12f1907e901d9791d25359c00db1e851aba931 (diff) | |
| download | external_python_setuptools-9121e19a1f3923456855f816d1ec7385d33aa018.tar.gz external_python_setuptools-9121e19a1f3923456855f816d1ec7385d33aa018.tar.bz2 external_python_setuptools-9121e19a1f3923456855f816d1ec7385d33aa018.zip | |
Refactor SvnInfo.load for cleaner logic and less wrapping. Also removed empty logic branch.
Diffstat (limited to 'setuptools/svn_utils.py')
| -rw-r--r-- | setuptools/svn_utils.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/setuptools/svn_utils.py b/setuptools/svn_utils.py index 7ee78678..a9bdc5c3 100644 --- a/setuptools/svn_utils.py +++ b/setuptools/svn_utils.py @@ -262,17 +262,18 @@ class SvnInfo(object): except ValueError:
base_svn_version = tuple()
- if has_svn and (code or not base_svn_version
- or base_svn_version < (1, 3)):
+ if not has_svn:
+ return SvnInfo(dirname)
+
+ if code or not base_svn_version or base_svn_version < (1, 3):
warnings.warn(("No SVN 1.3+ command found: falling back "
"on pre 1.7 .svn parsing"), DeprecationWarning)
return SvnFileInfo(dirname)
- elif not has_svn:
- return SvnInfo(dirname)
- elif base_svn_version < (1, 5):
+
+ if base_svn_version < (1, 5):
return Svn13Info(dirname)
- else:
- return Svn15Info(dirname)
+
+ return Svn15Info(dirname)
def __init__(self, path=''):
self.path = path
|