/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: 2009-12-23 04:19:34 UTC
  • mto: This revision was merged to the branch mainline in revision 4922.
  • Revision ID: john@arbash-meinel.com-20091223041934-zbixrn1cg015bqq4
Rename test_bencode to test__bencode, and use self.module

This makes it more similar to the rest of the extension permutation tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006, 2007 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
32
32
 
33
33
 
34
34
import tempfile
35
 
import thread
36
35
import threading
37
36
 
38
37
from bzrlib import (
292
291
        self._command = None
293
292
        if 'hpss' in debug.debug_flags:
294
293
            self._request_start_time = osutils.timer_func()
295
 
            self._thread_id = thread.get_ident()
 
294
            cur_thread = threading.currentThread()
 
295
            self._thread_id = getattr(cur_thread, 'ident', None)
 
296
            if self._thread_id is None:
 
297
                self._thread_id = cur_thread.getName()
296
298
 
297
299
    def _trace(self, action, message, extra_bytes=None, include_time=False):
298
300
        # It is a bit of a shame that this functionality overlaps with that of 
561
563
    'BzrDir.open_branchV2', 'bzrlib.smart.bzrdir',
562
564
    'SmartServerRequestOpenBranchV2')
563
565
request_handlers.register_lazy(
564
 
    'BzrDir.open_branchV3', 'bzrlib.smart.bzrdir',
565
 
    'SmartServerRequestOpenBranchV3')
566
 
request_handlers.register_lazy(
567
566
    'delete', 'bzrlib.smart.vfs', 'DeleteRequest')
568
567
request_handlers.register_lazy(
569
568
    'get', 'bzrlib.smart.vfs', 'GetRequest')