/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/protocol.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/protocol.py
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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
 
            # python 2.6 introduced 'ident' as a nice small integer to
1151
 
            # represent a thread. But it doesn't exist in 2.4/2.5
1152
 
            cur_thread = threading.currentThread()
1153
 
            self._thread_id = getattr(cur_thread, 'ident', None)
1154
 
            if self._thread_id is None:
1155
 
                self._thread_id = cur_thread.getName()
 
1151
            self._thread_id = thread.get_ident()
1156
1152
            self._response_start_time = None
1157
1153
 
1158
1154
    def _trace(self, action, message, extra_bytes=None, include_time=False):