/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-08-18 21:41:08 UTC
  • mto: This revision was merged to the branch mainline in revision 4629.
  • Revision ID: john@arbash-meinel.com-20090818214108-03e6hkoj7v4va7x8
Turns out that some code assumed passing NULL_REVISION to merge_sort
always was fine, and now that we are using 'keys' it was passing (NULL_REVISION,)
for now, that should be ok.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/_bencode_py.py
154
154
        encode_int(int(x), r)
155
155
    encode_func[BooleanType] = encode_bool
156
156
 
157
 
from bzrlib._static_tuple_py import StaticTuple
158
 
encode_func[StaticTuple] = encode_list
159
 
try:
160
 
    from bzrlib._static_tuple_c import StaticTuple
161
 
except ImportError:
162
 
    pass
163
 
else:
164
 
    encode_func[StaticTuple] = encode_list
165
 
 
166
157
 
167
158
def bencode(x):
168
159
    r = []