/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/smart/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/smart/server.py
25
25
import time
26
26
import threading
27
27
 
28
 
from breezy.hooks import Hooks
29
 
from breezy import (
 
28
from ..hooks import Hooks
 
29
from .. import (
30
30
    errors,
31
31
    trace,
32
32
    transport as _mod_transport,
33
33
)
34
 
from breezy.i18n import gettext
35
 
from breezy.lazy_import import lazy_import
 
34
from ..i18n import gettext
 
35
from ..lazy_import import lazy_import
36
36
lazy_import(globals(), """
37
37
from breezy.smart import (
38
38
    medium,
113
113
                socket.SO_REUSEADDR, 1)
114
114
        try:
115
115
            self._server_socket.bind(sockaddr)
116
 
        except self._socket_error, message:
 
116
        except self._socket_error as message:
117
117
            raise errors.CannotBindAddress(host, port, message)
118
118
        self._sockname = self._server_socket.getsockname()
119
119
        self.port = self._sockname[1]
210
210
                    except self._socket_timeout:
211
211
                        # just check if we're asked to stop
212
212
                        pass
213
 
                    except self._socket_error, e:
 
213
                    except self._socket_error as e:
214
214
                        # if the socket is closed by stop_background_thread
215
215
                        # we might get a EBADF here, or if we get a signal we
216
216
                        # can get EINTR, any other socket errors should get
228
228
            except KeyboardInterrupt:
229
229
                # dont log when CTRL-C'd.
230
230
                raise
231
 
            except Exception, e:
 
231
            except Exception as e:
232
232
                trace.report_exception(sys.exc_info(), sys.stderr)
233
233
                raise
234
234
        finally: