/breezy/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/trunk

« back to all changes in this revision

Viewing changes to breezy/transport/http/_urllib2_wrappers.py

  • Committer: Jelmer Vernooij
  • Date: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
586
586
        if not host:
587
587
            # Just a bit of paranoia here, this should have been
588
588
            # handled in the higher levels
589
 
            raise errors.InvalidURL(request.get_full_url(), 'no host given.')
 
589
            raise urlutils.InvalidURL(request.get_full_url(), 'no host given.')
590
590
 
591
591
        # We create a connection (but it will not connect until the first
592
592
        # request is made)
597
597
                ca_certs=self.ca_certs)
598
598
        except httplib.InvalidURL as exception:
599
599
            # There is only one occurrence of InvalidURL in httplib
600
 
            raise errors.InvalidURL(request.get_full_url(),
 
600
            raise urlutils.InvalidURL(request.get_full_url(),
601
601
                                    extra='nonnumeric port')
602
602
 
603
603
        return connection
1127
1127
 
1128
1128
        parsed_url = transport.ConnectedTransport._split_url(proxy)
1129
1129
        if not parsed_url.host:
1130
 
            raise errors.InvalidURL(proxy, 'No host component')
 
1130
            raise urlutils.InvalidURL(proxy, 'No host component')
1131
1131
 
1132
1132
        if request.proxy_auth == {}:
1133
1133
            # No proxy auth parameter are available, we are handling the first