← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/http_server.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/http_server.py
22
22
import re
23
23
import SimpleHTTPServer
24
24
import socket
25
 
import urllib
26
25
import urlparse
27
26
 
 
27
from bzrlib import urlutils
28
28
from bzrlib.tests import test_server
29
29
 
30
30
 
336
336
        """
337
337
        # abandon query parameters
338
338
        path = urlparse.urlparse(path)[2]
339
 
        path = posixpath.normpath(urllib.unquote(path))
 
339
        path = posixpath.normpath(urlutils.unquote(path))
340
340
        path = path.decode('utf-8')
341
341
        words = path.split('/')
342
342
        words = filter(None, words)