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

  • Committer: Vincent Ladeuil
  • Date: 2007-11-29 23:22:01 UTC
  • mto: (3059.2.1 173010)
  • mto: This revision was merged to the branch mainline in revision 3060.
  • Revision ID: v.ladeuil+lp@free.fr-20071129232201-thjmmlgo5ucbrwfn
Add tests and fix trivial bugs and other typos.

* bzrlib/transport/http/response.py:
(handle_response): Delete obsolete TODO.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._readv): Fix some trivial bugs revealed by the
test suite.
(HttpTransportBase._coalesce_readv): Fix list splice access, first
seen by jam, but found by the test suite too.

* bzrlib/tests/test_http.py:
Fix some imports.
(TestRangeRequestServer.test_readv_multiple_get_requests):
Exercise the rewritten readv.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): Count the requests (more tests
use that info).

* bzrlib/tests/HTTPTestUtil.py:
(LimitedRangeRequestHandler.do_GET): The statistics are collected
in the base request handler now.
(NoRangeRequestHandler.do_GET): But since we bypass the base
handler, re-enable the statistics collection here.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/intset.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
# Author: Martin Pool <mbp@canonical.com>
18
18
 
60
60
    True
61
61
    >>> list(a)
62
62
    [10]
63
 
 
 
63
    
64
64
    """
65
65
    __slots__ = ['_val']
66
66
 
80
80
 
81
81
        >>> bool(IntSet())
82
82
        False
83
 
 
 
83
        
84
84
        >>> bool(IntSet([0]))
85
85
        True
86
86
        """
129
129
        """
130
130
        if not isinstance(other, IntSet):
131
131
            raise NotImplementedError(type(other))
132
 
        return IntSet(bitmask=(self._val | other._val))
 
132
        return IntSet(bitmask=(self._val | other._val))        
133
133
 
134
134
 
135
135
    def __eq__(self, other):
149
149
 
150
150
 
151
151
    def __contains__(self, i):
 
152
        assert i >= 0
152
153
        return self._val & (1L << i)
153
154
 
154
155
 
169
170
            v = v >> 1
170
171
            o = o + 1
171
172
 
172
 
 
 
173
        
173
174
    def update(self, to_add):
174
175
        """Add all the values from the sequence or intset to_add"""
175
176
        if isinstance(to_add, IntSet):
176
177
            self._val |= to_add._val
177
178
        else:
178
179
            for i in to_add:
 
180
                assert i >= 0
179
181
                self._val |= (1L << i)
180
182
 
181
183
 
182
184
    def add(self, to_add):
 
185
        assert 0 <= to_add
183
186
        self._val |= (1L << to_add)
184
187
 
185
188
 
200
203
        >>> not a
201
204
        True
202
205
        """
 
206
        assert 0 <= to_remove
203
207
        m = 1L << to_remove
204
208
        if not self._val & m:
205
209
            raise KeyError(to_remove)