Merge branch '0.23.x'

378f85ad · Stefan Behnel · 77009a7a · 3489c221 · 378f85ad
Commit 378f85ad authored Sep 13, 2015 by Stefan Behnel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Cython/Utility/__init__.py Cython/Utility/__init__.py +2 -2

No files found.
--- a/Cython/Utility/__init__.py
+++ b/Cython/Utility/__init__.py
@@ -6,8 +6,8 @@ def pylong_join(count, digits_ptr='digits', join_type='unsigned long'):

    (((d[2] << n) | d[1]) << n) | d[0]
    """
-    return ('(' * (count * 2) + "(%s)" % join_type + ' | '.join(
-        "%s[%d])%s)" % (digits_ptr, _i, " << PyLong_SHIFT" if _i else '')
+    return ('(' * (count * 2) + ' | '.join(
+        "(%s)%s[%d])%s)" % (join_type, digits_ptr, _i, " << PyLong_SHIFT" if _i else '')
        for _i in range(count-1, -1, -1)))