← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/launchpad/lp_api.py

  • Committer: Patch Queue Manager
  • Date: 2013-06-24 13:05:33 UTC
  • mfrom: (6578.1.1 2.6-merges-2.5)
  • Revision ID: pqm@pqm.ubuntu.com-20130624130533-51c8htekjd8mix3u
(jameinel) Merge bzr/2.5 into trunk,
 including the fix for bug #855155 (John A Meinel)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_api.py
23
23
# needed by a command that uses it.
24
24
 
25
25
 
26
 
import httplib2
27
26
import os
28
27
import re
29
28
import urlparse
119
118
 
120
119
    :return: The root `Launchpad` object from launchpadlib.
121
120
    """
122
 
    if proxy_info is None:
123
 
        proxy_info = httplib2.proxy_info_from_environment('https')
124
121
    cache_directory = get_cache_directory()
125
122
    launchpad = Launchpad.login_with(
126
123
        'bzr', _get_api_url(service), cache_directory, timeout=timeout,