diff options
author | Jannis Leidel <jannis@leidel.info> | 2012-09-01 16:19:19 +0200 |
---|---|---|
committer | Jannis Leidel <jannis@leidel.info> | 2012-09-01 16:19:19 +0200 |
commit | 235e1dea02abd3a89ab53ea8035fd4ee8a37887b (patch) | |
tree | 5e7b2c5a853aefed870863bed9da6722100e2420 /pip/vcs/bazaar.py | |
parent | 6083597ebebd05d28b57d53c6077bfa7c3b168f8 (diff) | |
parent | b183a327412e83ac24a9c9d28a6bedd94bb69d7b (diff) | |
download | pip-threaded-page-getting.tar.gz |
Merge branch 'develop' into threaded-page-gettingthreaded-page-getting
Diffstat (limited to 'pip/vcs/bazaar.py')
-rw-r--r-- | pip/vcs/bazaar.py | 7 |
1 files changed, 5 insertions, 2 deletions
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 |