← 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: Vincent Ladeuil
  • Date: 2016-01-21 10:50:35 UTC
  • mfrom: (6609 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6610.
  • Revision ID: v.ladeuil+lp@free.fr-20160121105035-r67vcb49o142g2li
Merge trunk

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
26
27
import os
27
28
import re
28
29
import urlparse
118
119
 
119
120
    :return: The root `Launchpad` object from launchpadlib.
120
121
    """
 
122
    if proxy_info is None:
 
123
        proxy_info = httplib2.proxy_info_from_environment('https')
121
124
    cache_directory = get_cache_directory()
122
125
    launchpad = Launchpad.login_with(
123
126
        'bzr', _get_api_url(service), cache_directory, timeout=timeout,