Rev 6599: (richard-wilbur) Allows launchpad APIs to use proxies by default(Paul Gear). in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6599 [merge]
revision-id: pqm at pqm.ubuntu.com-20140922191434-6bbnpnxi5jab4vim
parent: pqm at pqm.ubuntu.com-20140620152437-lrczj6lnsbp1gpsl
parent: paul.gear at canonical.com-20140912101641-rj89avyjvqiro6gh
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2014-09-22 19:14:34 +0000
message:
  (richard-wilbur) Allows launchpad APIs to use proxies by default(Paul Gear).
   (Paul Gear)
modified:
  bzrlib/plugins/launchpad/lp_api.py lp_api.py-20090704082908-79il6zl4gugwl3wz-1
=== modified file 'bzrlib/plugins/launchpad/lp_api.py'
--- a/bzrlib/plugins/launchpad/lp_api.py	2012-07-20 15:09:13 +0000
+++ b/bzrlib/plugins/launchpad/lp_api.py	2014-09-12 10:16:41 +0000
@@ -23,6 +23,7 @@
 # needed by a command that uses it.
 
 
+import httplib2
 import os
 import re
 import urlparse
@@ -118,6 +119,8 @@
 
     :return: The root `Launchpad` object from launchpadlib.
     """
+    if proxy_info is None:
+        proxy_info = httplib2.proxy_info_from_environment('https')
     cache_directory = get_cache_directory()
     launchpad = Launchpad.login_with(
         'bzr', _get_api_url(service), cache_directory, timeout=timeout,