~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/server.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-26 07:56:05 UTC
  • mfrom: (6165 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6170.
  • Revision ID: john@arbash-meinel.com-20110926075605-czuukdiawz68dpbd
Merge bzr.dev 6165, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
    trace,
30
30
    transport as _mod_transport,
31
31
)
 
32
from bzrlib.i18n import gettext
32
33
from bzrlib.lazy_import import lazy_import
33
34
lazy_import(globals(), """
34
35
from bzrlib.smart import (
450
451
            smart_server = SmartTCPServer(self.transport,
451
452
                                          client_timeout=timeout)
452
453
            smart_server.start_server(host, port)
453
 
            trace.note('listening on port: %s' % smart_server.port)
 
454
            trace.note(gettext('listening on port: %s') % smart_server.port)
454
455
        self.smart_server = smart_server
455
456
 
456
457
    def _change_globals(self):