/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/launchpad/lp_registration.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/launchpad/lp_registration.py
94
94
    # NB: these should always end in a slash to avoid xmlrpclib appending
95
95
    # '/RPC2'
96
96
    LAUNCHPAD_INSTANCE = {}
97
 
    for instance, domain in LAUNCHPAD_DOMAINS.iteritems():
 
97
    for instance, domain in LAUNCHPAD_DOMAINS.items():
98
98
        LAUNCHPAD_INSTANCE[instance] = 'https://xmlrpc.%s/bazaar/' % domain
99
99
 
100
100
    # We use production as the default because edge has been deprecated circa
197
197
        else:
198
198
            domains = (
199
199
                'bazaar.%s' % domain
200
 
                for domain in self.LAUNCHPAD_DOMAINS.itervalues())
 
200
                for domain in self.LAUNCHPAD_DOMAINS.values())
201
201
            if hostinfo not in domains:
202
202
                raise NotLaunchpadBranch(branch_url)
203
203
        return path.lstrip('/')