Merge lp:~jameinel/bzr/2.1.0b4-490600-no-extensions into lp:bzr

[John A Meinel]

[John A Meinel (jameinel)]

This seems to fix the last few test cases that were failing when extensions were not compiled.

[Martin Pool (mbp)]

Seems plausible, though I'm not deeply into the history of this bug.

[Vincent Ladeuil (vila)]

Thanks a lot John, I'll merge.

review: Approve

=== modified file 'bzrlib/index.py'
--- bzrlib/index.py	2009-11-07 01:58:11 +0000
+++ bzrlib/index.py	2009-12-01 20:00:32 +0000
@@ -205,7 +205,9 @@
                 if reference not in self._nodes:
                     self._check_key(reference)
                     absent_references.append(reference)
-            node_refs.append(as_st(reference_list))
+            reference_list = as_st([as_st(ref).intern()
+                                    for ref in reference_list])
+            node_refs.append(reference_list)
         return as_st(node_refs), absent_references
 
     def add_node(self, key, value, references=()):

=== modified file 'bzrlib/util/_bencode_py.py'
--- bzrlib/util/_bencode_py.py	2009-10-13 14:36:50 +0000
+++ bzrlib/util/_bencode_py.py	2009-12-01 20:00:32 +0000
@@ -154,6 +154,8 @@
         encode_int(int(x), r)
     encode_func[BooleanType] = encode_bool
 
+from bzrlib._static_tuple_py import StaticTuple
+encode_func[StaticTuple] = encode_list
 try:
     from bzrlib._static_tuple_c import StaticTuple
 except ImportError: