Rev 4715: Merge in the babune updates in http://bazaar.launchpad.net/~jameinel/bzr/2.1-memory-consumption

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/2.1-memory-consumption

------------------------------------------------------------
revno: 4715 [merge]
revision-id: john at arbash-meinel.com-20090930165335-8fmh1trad0xqfade
parent: john at arbash-meinel.com-20090930165051-538myw1dpmz0214g
parent: john at arbash-meinel.com-20090930155602-qjn7tqxe77zwm85x
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.1-memory-consumption
timestamp: Wed 2009-09-30 11:53:35 -0500
message:
  Merge in the babune updates
modified:
  bzrlib/_keys_type_c.c          _keys_type_c.c-20090908204220-aa346ccw4l37jzt7-1
  bzrlib/_keys_type_c.h          _keys_type_c.h-20090913185138-f86v5xm1zlckguaj-1
-------------- next part --------------
=== modified file 'bzrlib/_keys_type_c.c'
--- a/bzrlib/_keys_type_c.c	2009-09-30 16:50:51 +0000
+++ b/bzrlib/_keys_type_c.c	2009-09-30 16:53:35 +0000
@@ -504,7 +504,8 @@
     0,                              /* sq_contains */
 };
 
-static PyTypeObject Key_Type = {
+
+PyTypeObject Key_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                                           /* ob_size */
     "Key",                                       /* tp_name */
@@ -852,7 +853,7 @@
     0,                              /* sq_contains */
 };
 
-static PyTypeObject Keys_Type = {
+PyTypeObject Keys_Type = {
     PyObject_HEAD_INIT(NULL)
     0,                                           /* ob_size */
     "Keys",                                      /* tp_name */

=== modified file 'bzrlib/_keys_type_c.h'
--- a/bzrlib/_keys_type_c.h	2009-09-30 04:45:53 +0000
+++ b/bzrlib/_keys_type_c.h	2009-09-30 15:56:02 +0000
@@ -84,7 +84,7 @@
     PyObject_VAR_HEAD
     Key *table[1];
 } KeyIntern;
-extern PyTypeObject Key_Type;
+// extern PyTypeObject Key_Type;
 
 #define Key_SET_ITEM(key, offset, val) \
     ((((Key*)key)->key_bits[offset]) = (PyStringObject *)val)