← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/medium.py

  • Committer: Robert Collins
  • Date: 2009-12-22 23:09:50 UTC
  • mfrom: (4918 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4920.
  • Revision ID: robertc@robertcollins.net-20091222230950-39gjmost0lmu9ufg
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/medium.py
33
33
from bzrlib.lazy_import import lazy_import
34
34
lazy_import(globals(), """
35
35
import atexit
36
 
import threading
 
36
import thread
37
37
import weakref
38
38
 
39
39
from bzrlib import (
300
300
        tstart = osutils.timer_func()
301
301
        osutils.send_all(self.socket, bytes, self._report_activity)
302
302
        if 'hpss' in debug.debug_flags:
303
 
            thread_id = threading.currentThread().ident
 
303
            thread_id = thread.get_ident()
304
304
            trace.mutter('%12s: [%s] %d bytes to the socket in %.3fs'
305
305
                         % ('wrote', thread_id, len(bytes),
306
306
                            osutils.timer_func() - tstart))