/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: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/http_server.py
24
24
import socket
25
25
import urlparse
26
26
 
27
 
from breezy import urlutils
28
 
from breezy.tests import test_server
 
27
from .. import (
 
28
    osutils,
 
29
    urlutils,
 
30
)
 
31
from . import test_server
29
32
 
30
33
 
31
34
class BadWebserverPath(ValueError):
80
83
        """
81
84
        try:
82
85
            self._handle_one_request()
83
 
        except socket.error, e:
 
86
        except socket.error as e:
84
87
            # Any socket error should close the connection, but some errors are
85
88
            # due to the client closing early and we don't want to pollute test
86
89
            # results, so we raise only the others.
472
475
            raise AssertionError(
473
476
                "HTTPServer currently assumes local transport, got %s" %
474
477
                backing_transport_server)
475
 
        self._home_dir = os.getcwdu()
 
478
        self._home_dir = osutils.getcwd()
476
479
        self._local_path_parts = self._home_dir.split(os.path.sep)
477
480
        self.logs = []
478
481