/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/smart/request.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:
32
32
 
33
33
 
34
34
import tempfile
 
35
import thread
35
36
import threading
36
37
 
37
38
from bzrlib import (
291
292
        self._command = None
292
293
        if 'hpss' in debug.debug_flags:
293
294
            self._request_start_time = osutils.timer_func()
294
 
            self._thread_id = threading.currentThread().get_ident()
 
295
            self._thread_id = thread.get_ident()
295
296
 
296
297
    def _trace(self, action, message, extra_bytes=None, include_time=False):
297
298
        # It is a bit of a shame that this functionality overlaps with that of