Rev 6118: (jelmer) Some compatibility fixes for cython.dev. (Denys Duchier) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 6118 [merge]
revision-id: pqm at pqm.ubuntu.com-20110901084618-j9ajgwuc0q3ka4zu
parent: pqm at pqm.ubuntu.com-20110901063530-2opindd7ks84297p
parent: denys.duchier at univ-orleans.fr-20110830144541-q5wmphbr4oxxpyo4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2011-09-01 08:46:18 +0000
message:
  (jelmer) Some compatibility fixes for cython.dev. (Denys Duchier)
modified:
  bzrlib/_dirstate_helpers_pyx.pyx dirstate_helpers.pyx-20070503201057-u425eni465q4idwn-3
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
=== modified file 'bzrlib/_dirstate_helpers_pyx.pyx'
--- a/bzrlib/_dirstate_helpers_pyx.pyx	2011-04-22 14:12:22 +0000
+++ b/bzrlib/_dirstate_helpers_pyx.pyx	2011-08-30 14:45:41 +0000
@@ -1793,6 +1793,7 @@
                 advance_entry = -1
                 advance_path = -1
                 result = None
+                changed = None
                 path_handled = 0
                 if current_entry is None:
                     # unversioned -  the check for path_handled when the path

=== modified file 'setup.py'
--- a/setup.py	2011-08-25 11:02:37 +0000
+++ b/setup.py	2011-08-30 14:44:42 +0000
@@ -202,7 +202,9 @@
     from distutils.command.build_ext import build_ext
 else:
     have_pyrex = True
-    pyrex_version_info = tuple(map(int, pyrex_version.split('.')))
+    import re
+    _version = re.match("^[0-9.]+", pyrex_version).group(0)
+    pyrex_version_info = tuple(map(int, _version.split('.')))
 
 
 class build_ext_if_possible(build_ext):