/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 breezy/tests/http_server.py

  • Committer: Martin
  • Date: 2018-06-30 22:18:39 UTC
  • mfrom: (7010 work)
  • mto: This revision was merged to the branch mainline in revision 7012.
  • Revision ID: gzlist@googlemail.com-20180630221839-98zi78xwcggestse
Merge trunk to fix conflict

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/http_server.py
26
26
import random
27
27
import re
28
28
import socket
 
29
import sys
29
30
try:
30
31
    from urlparse import urlparse
31
32
except ImportError:
125
126
        self.send_header('Connection', 'close')
126
127
        self.end_headers()
127
128
        if self.command != 'HEAD' and code >= 200 and code not in (204, 304):
128
 
            self.wfile.write(content)
 
129
            self.wfile.write(content.encode('utf-8'))
129
130
 
130
131
    def _handle_one_request(self):
131
132
        http_server.SimpleHTTPRequestHandler.handle_one_request(self)
339
340
        # abandon query parameters
340
341
        path = urlparse(path)[2]
341
342
        path = posixpath.normpath(urlutils.unquote(path))
342
 
        path = path.decode('utf-8')
 
343
        if sys.version_info[0] == 2:
 
344
             path = path.decode('utf-8')
343
345
        words = path.split('/')
344
346
        path = self._cwd
345
347
        for num, word in enumerate(w for w in words if w):