Author: Alex Gaynor <[email protected]>
Branch: py3.3
Changeset: r72655:3d0db2b14b40
Date: 2014-08-02 14:39 -0700
http://bitbucket.org/pypy/pypy/changeset/3d0db2b14b40/

Log:    Merged in numerodix/pypy/py3.3-fixes (pull request #263)

        wrap LONGLONG_MASK (fixes #1836)

diff --git a/pypy/module/_lzma/interp_lzma.py b/pypy/module/_lzma/interp_lzma.py
--- a/pypy/module/_lzma/interp_lzma.py
+++ b/pypy/module/_lzma/interp_lzma.py
@@ -13,6 +13,7 @@
 
 
 FORMAT_AUTO, FORMAT_XZ, FORMAT_ALONE, FORMAT_RAW = range(4)
+R_LONGLONG_MASK = r_ulonglong(LONGLONG_MASK)
 
 
 eci = ExternalCompilationInfo(
@@ -282,7 +283,7 @@
         W_LZMADecompressor.__init__(self, space, format)
 
         if space.is_none(w_memlimit):
-            memlimit = r_ulonglong(LONGLONG_MASK)
+            memlimit = R_LONGLONG_MASK
         else:
             memlimit = space.r_ulonglong_w(w_memlimit)
 
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit

Reply via email to