/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 bzrlib/transport/http/_urllib2_wrappers.py

  • Committer: Robert Collins
  • Date: 2007-03-07 01:14:11 UTC
  • mfrom: (2321 +trunk)
  • mto: (2321.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: robertc@robertcollins.net-20070307011411-0cmmc8atx67v3nv7
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/http/_urllib2_wrappers.py
702
702
        if self._debuglevel > 0:
703
703
            print 'set_proxy %s_request for %r' % (type, proxy)
704
704
        orig_type = request.get_type()
705
 
        type, r_type = urllib.splittype(proxy)
706
 
        host, XXX = urllib.splithost(r_type)
707
 
        if '@' in host:
 
705
        scheme, r_scheme = urllib.splittype(proxy)
 
706
        if self._debuglevel > 0:
 
707
            print 'scheme: %s, r_scheme: %s' % (scheme, r_scheme)
 
708
        host, XXX = urllib.splithost(r_scheme)
 
709
        if host is None:
 
710
            raise errors.InvalidURL(proxy,
 
711
                                    'Invalid syntax in proxy env variable')
 
712
        elif '@' in host:
708
713
            user_pass, host = host.split('@', 1)
709
714
            if ':' in user_pass:
710
715
                user, password = user_pass.split(':', 1)