Rev 4531: Merge bzr.1.17 tip, and update NEWS about fixing bug #399356 in http://bazaar.launchpad.net/~jameinel/bzr/1.17-build-updates

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/1.17-build-updates

------------------------------------------------------------
revno: 4531 [merge]
revision-id: john at arbash-meinel.com-20090715023213-piv51px1ef3wkg4y
parent: john at arbash-meinel.com-20090714150119-mbalfuwuwhbkpn8r
parent: pqm at pqm.ubuntu.com-20090714204235-ii82khmazuonuxja
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.17-build-updates
timestamp: Tue 2009-07-14 21:32:13 -0500
message:
  Merge bzr.1.17 tip, and update NEWS about fixing bug #399356
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/_known_graph_pyx.pyx    _known_graph_pyx.pyx-20090610194911-yjk73td9hpjilas0-1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-07-13 00:12:04 +0000
+++ b/NEWS	2009-07-15 02:32:13 +0000
@@ -6,6 +6,21 @@
 .. contents:: List of Releases
    :depth: 1
 
+bzr 1.17
+########
+
+Bug Fixes
+*********
+
+* Change an extension to call the python ``frozenset()`` rather than the C
+  api ``PyFrozenSet_New``. It turns out that python2.4 did not expose the
+  C api. (John Arbash Meinel, #399366)
+
+* Fixes for the Makefile and the rename of ``generate_docs.py`` to
+  ``tools/generate_docs.py`` to allow everything to be built on Windows.
+  (John Arbash Meinel, #399356)
+
+
 bzr 1.17rc1 "So late it's brunch" 2009-07-13
 ############################################
 

=== modified file 'bzrlib/_known_graph_pyx.pyx'
--- a/bzrlib/_known_graph_pyx.pyx	2009-06-19 20:35:35 +0000
+++ b/bzrlib/_known_graph_pyx.pyx	2009-07-14 16:10:32 +0000
@@ -25,8 +25,6 @@
     ctypedef struct PyObject:
         pass
 
-    object PyFrozenSet_New(object)
-
     object PyTuple_New(Py_ssize_t n)
     Py_ssize_t PyTuple_GET_SIZE(object t)
     PyObject * PyTuple_GET_ITEM(object t, Py_ssize_t o)
@@ -267,7 +265,7 @@
         cdef Py_ssize_t pos, last_item
         cdef long min_gdfo
 
-        heads_key = PyFrozenSet_New(keys)
+        heads_key = frozenset(keys)
         maybe_heads = PyDict_GetItem(self._known_heads, heads_key)
         if maybe_heads != NULL:
             return <object>maybe_heads
@@ -285,7 +283,7 @@
             if not candidate_nodes:
                 return frozenset([NULL_REVISION])
             # The keys changed, so recalculate heads_key
-            heads_key = PyFrozenSet_New(candidate_nodes)
+            heads_key = frozenset(candidate_nodes)
         if PyDict_Size(candidate_nodes) < 2:
             return heads_key
 
@@ -330,7 +328,7 @@
             node = <_KnownGraphNode>temp_node
             if not node.seen:
                 PyList_Append(heads, node.key)
-        heads = PyFrozenSet_New(heads)
+        heads = frozenset(heads)
         for pos from 0 <= pos < PyList_GET_SIZE(cleanup):
             node = _get_list_node(cleanup, pos)
             node.seen = 0