/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/blackbox/test_serve.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/blackbox/test_serve.py
70
70
                if func is not None:
71
71
                    try:
72
72
                        func(*func_args, **func_kwargs)
73
 
                    except Exception, e:
 
73
                    except Exception as e:
74
74
                        # Log errors to make some test failures a little less
75
75
                        # mysterious.
76
76
                        trace.mutter('func broke: %r', e)
96
96
        try:
97
97
            out, err = self.run_bzr(['serve'] + list(serve_args),
98
98
                                    retcode=retcode)
99
 
        except KeyboardInterrupt, e:
 
99
        except KeyboardInterrupt as e:
100
100
            out, err = e.args
101
101
        return out, err
102
102
 
373
373
        resp = smart_client.call('BzrDirFormat.initialize', 'foo/')
374
374
        try:
375
375
            resp = smart_client.call('BzrDir.find_repositoryV3', 'foo/')
376
 
        except errors.ErrorFromSmartServer, e:
 
376
        except errors.ErrorFromSmartServer as e:
377
377
            resp = e.error_tuple
378
378
        self.client_resp = resp
379
379
        client_medium.disconnect()