/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/ftp_server/pyftpdlib_based.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/ftp_server/pyftpdlib_based.py
148
148
            raise AssertionError(
149
149
                "FTPServer currently assumes local transport, got %s"
150
150
                % vfs_server)
151
 
        self._root = os.getcwdu()
 
151
        self._root = osutils.getcwd()
152
152
 
153
153
        address = ('localhost', 0) # bind to a random port
154
154
        authorizer = AnonymousWithWriteAccessAuthorizer()
197
197
        while self._ftpd_running:
198
198
            try:
199
199
                self._ftp_server.serve_forever(timeout=0.1, count=1)
200
 
            except select.error, e:
 
200
            except select.error as e:
201
201
                if e.args[0] != errno.EBADF:
202
202
                    raise
203
203
        self._ftp_server.close_all(ignore_all=True)