← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Ian Clatworthy
  • Date: 2007-12-05 12:54:14 UTC
  • mto: (3092.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3093.
  • Revision ID: ian.clatworthy@internode.on.net-20071205125414-pmgapgkgx7vpi33y
Add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/launchpad/lp_indirect.py
58
58
    def __init__(self, base):
59
59
        super(LaunchpadTransport, self).__init__(base)
60
60
        # We only support URLs without a netloc
61
 
        self.lp_instance = urlsplit(base)[1]
62
 
        if self.lp_instance == '':
63
 
            self.lp_instance = None
64
 
        elif self.lp_instance not in LaunchpadService.LAUNCHPAD_INSTANCE:
 
61
        netloc = urlsplit(base)[1]
 
62
        if netloc != '':
65
63
            raise errors.InvalidURL(path=base)
66
64
 
67
65
    def _requires_launchpad_login(self, scheme, netloc, path, query,
82
80
        path = urlsplit(abspath)[2].lstrip('/')
83
81
        # Perform an XMLRPC request to resolve the path
84
82
        resolve = _request_factory(path)
85
 
        service = LaunchpadService(lp_instance=self.lp_instance)
 
83
        service = LaunchpadService()
86
84
        try:
87
85
            result = resolve.submit(service)
88
86
        except xmlrpclib.Fault, fault: