Rev 4748: (jam) Tweak the initialization of StaticTuple_Type for Windows + in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 4748 [merge]
revision-id: pqm at pqm.ubuntu.com-20091015180224-g9dphv661law8y20
parent: pqm at pqm.ubuntu.com-20091015064821-bqmmhfto72csm1x7
parent: john at arbash-meinel.com-20091015161847-3l2t2hqz2tw3lut0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2009-10-15 19:02:24 +0100
message:
  (jam) Tweak the initialization of StaticTuple_Type for Windows +
  	python 2.5
modified:
  bzrlib/_static_tuple_c.c       _keys_type_c.c-20090908204220-aa346ccw4l37jzt7-1
=== modified file 'bzrlib/_static_tuple_c.c'
--- a/bzrlib/_static_tuple_c.c	2009-10-12 21:44:27 +0000
+++ b/bzrlib/_static_tuple_c.c	2009-10-15 16:18:47 +0000
@@ -604,7 +604,7 @@
     (hashfunc)StaticTuple_hash,                  /* tp_hash */
     0,                                           /* tp_call */
     0,                                           /* tp_str */
-    PyObject_GenericGetAttr,                     /* tp_getattro */
+    0,                                           /* tp_getattro */
     0,                                           /* tp_setattro */
     0,                                           /* tp_as_buffer */
     Py_TPFLAGS_DEFAULT,                          /* tp_flags*/
@@ -739,6 +739,7 @@
 {
     PyObject* m;
 
+    StaticTuple_Type.tp_getattro = PyObject_GenericGetAttr;
     if (PyType_Ready(&StaticTuple_Type) < 0)
         return;