[pypy-commit] pypy py3.3: merge upstream

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3.3
Changeset: r72659:7b27ed91a952
Date: 2014-08-02 18:46 -0700
http://bitbucket.org/pypy/pypy/changeset/7b27ed91a952/

Log:	merge upstream

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)