Rev 4852: (jam) Fix test regressions when extensions were not compiled in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4852 [merge]
revision-id: pqm at pqm.ubuntu.com-20091202092607-yc4f215s6ucjfb00
parent: pqm at pqm.ubuntu.com-20091202083913-4nczjgrq71pkk0st
parent: v.ladeuil+lp at free.fr-20091202084336-j1n07w2d0i9c36bk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2009-12-02 09:26:07 +0000
message:
  (jam) Fix test regressions when extensions were not compiled
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/util/_bencode_py.py     bencode.py-20070220044742-sltr28q21w2wzlxi-1
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2009-11-07 01:58:11 +0000
+++ b/bzrlib/index.py	2009-12-01 16:03:14 +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'
--- a/bzrlib/util/_bencode_py.py	2009-10-13 14:36:50 +0000
+++ b/bzrlib/util/_bencode_py.py	2009-12-01 19:44:12 +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: