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

  • Committer: Vincent Ladeuil
  • Date: 2009-01-30 00:49:41 UTC
  • mto: (3982.1.1 bzr.integration)
  • mto: This revision was merged to the branch mainline in revision 3983.
  • Revision ID: v.ladeuil+lp@free.fr-20090130004941-820fpd2ryyo127vv
Add more tests, fix pycurl double handling, revert previous tracking.

* bzrlib/tests/test_http.py:
(PredefinedRequestHandler): Renamed from
PreRecordedRequestHandler.
(PredefinedRequestHandler.handle_one_request): Get the canned
response from the test server directly.
(ActivityServerMixin): Make it a true object and intialize the
attributes in the constructor. Tests can now set the
canned_response attribute before querying the server.
(TestActivity.setUp, TestActivity.tearDown,
TestActivity.get_transport, TestActivity.assertActivitiesMatch):
Extracted from test_get to be able to write other tests.
(TestActivity.test_has, TestActivity.test_readv,
TestActivity.test_post): New tests, all cases should be covered
now.

* bzrlib/transport/http/response.py:
(RangeFile.__init__, RangeFile.read, handle_response): Revert
previous tracking, both http implementations can now report
activity from the socket.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._get_ranged, PyCurlTransport._post): Revert
previous tracking.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/_readdir_py.py
 
1
# Copyright (C) 2006, 2008 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
14
# along with this program; if not, write to the Free Software
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
"""Python implementation of readdir interface."""
 
18
 
 
19
 
 
20
import os
 
21
import stat
 
22
 
 
23
 
 
24
_directory = 'directory'
 
25
_chardev = 'chardev'
 
26
_block = 'block'
 
27
_file = 'file'
 
28
_fifo = 'fifo'
 
29
_symlink = 'symlink'
 
30
_socket = 'socket'
 
31
_unknown = 'unknown'
 
32
 
 
33
_formats = {
 
34
    stat.S_IFDIR:'directory',
 
35
    stat.S_IFCHR:'chardev',
 
36
    stat.S_IFBLK:'block',
 
37
    stat.S_IFREG:'file',
 
38
    stat.S_IFIFO:'fifo',
 
39
    stat.S_IFLNK:'symlink',
 
40
    stat.S_IFSOCK:'socket',
 
41
}
 
42
 
 
43
 
 
44
def _kind_from_mode(stat_mode, _formats=_formats, _unknown='unknown'):
 
45
    """Generate a file kind from a stat mode. This is used in walkdirs.
 
46
 
 
47
    It's performance is critical: Do not mutate without careful benchmarking.
 
48
    """
 
49
    try:
 
50
        return _formats[stat_mode & 0170000]
 
51
    except KeyError:
 
52
        return _unknown