← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/urlutils.py

  • Committer: Aaron Bentley
  • Date: 2006-12-07 15:30:26 UTC
  • mto: This revision was merged to the branch mainline in revision 2170.
  • Revision ID: abentley@panoramicfeedback.com-20061207153026-443kh4znfmeoo3bg
Fix reading bundles from http URLs

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/urlutils.py
259
259
        if path[i] not in _url_safe_characters:
260
260
            chars = path[i].encode('utf-8')
261
261
            path[i] = ''.join(['%%%02X' % ord(c) for c in path[i].encode('utf-8')])
262
 
    return scheme + '://' + ''.join(path)
 
262
    return str(scheme + '://' + ''.join(path))
263
263
 
264
264
 
265
265
def relative_url(base, other):
449
449
_url_safe_characters = set('abcdefghijklmnopqrstuvwxyz'
450
450
                        'ABCDEFGHIJKLMNOPQRSTUVWXYZ'
451
451
                        '0123456789' '_.-/'
452
 
                        ';?:@&=+$,%#')
 
452
                        ';?:@&=+$,%#~')
453
453
 
454
454
 
455
455
def unescape_for_display(url, encoding):