/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 bzrlib/tests/test_smart_transport.py

  • Committer: Jelmer Vernooij
  • Date: 2017-02-05 15:38:26 UTC
  • mto: (6621.2.1 py3)
  • mto: This revision was merged to the branch mainline in revision 6624.
  • Revision ID: jelmer@jelmer.uk-20170205153826-rnrd0m3iqoizqvrw
Apply 2to3 except fix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_smart_transport.py
764
764
        self.assertIs(None, client_medium._socket)
765
765
        try:
766
766
            self.assertEqual('', client_sock.recv(1))
767
 
        except socket.error, e:
 
767
        except socket.error as e:
768
768
            if e.errno not in (errno.EBADF,):
769
769
                raise
770
770
        req = client_medium.get_request()
1315
1315
        try:
1316
1316
            client_sock = self.connect_to_server(server)
1317
1317
            client_sock.close()
1318
 
        except socket.error, e:
 
1318
        except socket.error as e:
1319
1319
            # If the server has hung up already, that is fine.
1320
1320
            pass
1321
1321