/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/util/_bencode_py.py

  • Committer: John Arbash Meinel
  • Date: 2009-09-24 19:26:45 UTC
  • mto: (4634.52.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4716.
  • Revision ID: john@arbash-meinel.com-20090924192645-hyy1ycnnk6u3j5j6
Catch a corner case that we were missing.
The CHKInventory tests were passing, but failed for test_inv because
we were passing None to _getitems(). That only failed for InternalNodes,
but we were using a structure that didn't have internal nodes.
So now the test is parameterized on a small CHKInventory page size
to force those things out into the open.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/_bencode_py.py
90
90
            raise TypeError
91
91
        try:
92
92
            r, l = self.decode_func[x[0]](x, 0)
93
 
        except (IndexError, KeyError, OverflowError), e:
94
 
            import sys
95
 
            raise ValueError, ValueError(str(e)), sys.exc_info()[2]
 
93
        except (IndexError, KeyError):
 
94
            raise ValueError
96
95
        if l != len(x):
97
96
            raise ValueError
98
97
        return r
155
154
        encode_int(int(x), r)
156
155
    encode_func[BooleanType] = encode_bool
157
156
 
158
 
from bzrlib._static_tuple_py import StaticTuple
159
 
encode_func[StaticTuple] = encode_list
160
 
try:
161
 
    from bzrlib._static_tuple_c import StaticTuple
162
 
except ImportError:
163
 
    pass
164
 
else:
165
 
    encode_func[StaticTuple] = encode_list
166
 
 
167
157
 
168
158
def bencode(x):
169
159
    r = []