diff options
Diffstat (limited to 'pip/vcs')
| -rw-r--r-- | pip/vcs/__init__.py | 2 | ||||
| -rw-r--r-- | pip/vcs/bazaar.py | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pip/vcs/__init__.py b/pip/vcs/__init__.py index 7b122304b..a4b48a538 100644 --- a/pip/vcs/__init__.py +++ b/pip/vcs/__init__.py @@ -19,7 +19,7 @@ class VcsSupport(object): def __init__(self): # Register more schemes with urlparse for various version control systems urlparse.uses_netloc.extend(self.schemes) - # Python 3.3 doesn't have uses_fragment + # Python >= 2.7.4, 3.3 doesn't have uses_fragment if getattr(urlparse, 'uses_fragment', None): urlparse.uses_fragment.extend(self.schemes) super(VcsSupport, self).__init__() diff --git a/pip/vcs/bazaar.py b/pip/vcs/bazaar.py index d5419b2ff..86f4bbc62 100644 --- a/pip/vcs/bazaar.py +++ b/pip/vcs/bazaar.py @@ -19,8 +19,11 @@ class Bazaar(VersionControl): def __init__(self, url=None, *args, **kwargs): super(Bazaar, self).__init__(url, *args, **kwargs) - urlparse.non_hierarchical.extend(['lp']) - urlparse.uses_fragment.extend(['lp']) + # Python >= 2.7.4, 3.3 doesn't have uses_fragment or non_hierarchical + # Register lp but do not expose as a scheme to support bzr+lp. + if getattr(urlparse, 'uses_fragment', None): + urlparse.uses_fragment.extend(['lp']) + urlparse.non_hierarchical.extend(['lp']) def parse_vcs_bundle_file(self, content): url = rev = None |