← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/protocol.py

  • Committer: John Arbash Meinel
  • Date: 2010-01-05 04:30:07 UTC
  • mfrom: (4932 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4934.
  • Revision ID: john@arbash-meinel.com-20100105043007-ehgbldqd3q0gtyws
Merge bzr.dev, resolve conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
22
22
from cStringIO import StringIO
23
23
import struct
24
24
import sys
 
25
import thread
25
26
import threading
26
27
import time
27
28
 
1147
1148
        self.response_sent = False
1148
1149
        self._headers = {'Software version': bzrlib.__version__}
1149
1150
        if 'hpss' in debug.debug_flags:
1150
 
            self._thread_id = threading.currentThread().get_ident()
 
1151
            self._thread_id = thread.get_ident()
1151
1152
            self._response_start_time = None
1152
1153
 
1153
1154
    def _trace(self, action, message, extra_bytes=None, include_time=False):