Skipping one test in old version of CPython.

Fixing style.

Author: ppisl

graalpython/com.oracle.graal.python.test/src/tests/test_zlib.py

@@ -21,13 +21,12 @@
 # AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 # OF THE POSSIBILITY OF SUCH DAMAGE.
-# Qunaibit 02/05/2014
-# With Statement
 
 import unittest
 import zlib
 import binascii
 import re
+import sys
 
 pintNumber = 98765432109876543210
 longNumber = 9876543210
@@ -165,14 +164,16 @@ def test_speech(self):
         self.assertEqual(zlib.decompress(x), HAMLET_SCENE)
 
     def test_keywords(self):
-        x = zlib.compress(HAMLET_SCENE, level=3)
-        self.assertEqual(zlib.decompress(x), HAMLET_SCENE)
-        with self.assertRaises(TypeError):
-            zlib.compress(data=HAMLET_SCENE, level=3)
-        self.assertEqual(zlib.decompress(x,
+        if (sys.version_info.major >= 3 and sys.version_info.minor >= 6):
+            # the keywords were added later
+            x = zlib.compress(HAMLET_SCENE, level=3)
+            self.assertEqual(zlib.decompress(x), HAMLET_SCENE)
+            with self.assertRaises(TypeError):
+                zlib.compress(data=HAMLET_SCENE, level=3)
+            self.assertEqual(zlib.decompress(x,
                                          wbits=zlib.MAX_WBITS,
                                          bufsize=zlib.DEF_BUF_SIZE),
-                         HAMLET_SCENE)
+                        HAMLET_SCENE)
 
     def test_speech128(self):
         # compress more data

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/ZLibModuleBuiltins.java

@@ -238,7 +238,7 @@ private CastToIntegerFromIntNode getCastToIntNode() {
 
         @Specialization
         @TruffleBoundary
-        public long doit(PIBytesLike data, PNone value) {
+        public long doit(PIBytesLike data, @SuppressWarnings("unused") PNone value) {
             CRC32 crc32 = new CRC32();
             crc32.update(getToArrayNode().execute(data.getSequenceStorage()));
             return crc32.getValue();
@@ -249,15 +249,15 @@ public long doit(PIBytesLike data, long value) {
             // lost magnitude is ok here.
             int initValue = (int) value;
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
-            return ((long) computeCRC32(array, initValue) & 0xFFFFFFFFL);
+            return computeCRC32(array, initValue) & 0xFFFFFFFFL;
         }
 
         @Specialization
         public long doPInt(PIBytesLike data, PInt value) {
             // lost magnitude is ok here.
             int initValue = value.intValue();
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
-            return ((long) computeCRC32(array, initValue) & 0xFFFFFFFFL);
+            return computeCRC32(array, initValue) & 0xFFFFFFFFL;
         }
 
         @Specialization
@@ -267,7 +267,7 @@ public long doObject(PIBytesLike data, Object value,
         }
 
         @Fallback
-        public long doObject(Object data, Object value) {
+        public long doObject(Object data, @SuppressWarnings("unused") Object value) {
             throw raise(TypeError, "a bytes-like object is required, not '%p'", data);
         }
 
@@ -329,7 +329,7 @@ private CastToIntegerFromIntNode getCastToIntNode() {
 
         @Specialization
         @TruffleBoundary
-        public long doit(PIBytesLike data, PNone value) {
+        public long doit(PIBytesLike data, @SuppressWarnings("unused") PNone value) {
             Adler32 adler32 = new Adler32();
             adler32.update(getToArrayNode().execute(data.getSequenceStorage()));
             return adler32.getValue();
@@ -340,15 +340,15 @@ public long doit(PIBytesLike data, long value) {
             // lost magnitude is ok here.
             int initValue = (int) value;
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
-            return ((long) computeAdler32(array, initValue) & 0xFFFFFFFFL);
+            return computeAdler32(array, initValue) & 0xFFFFFFFFL;
         }
 
         @Specialization
         public long doPInt(PIBytesLike data, PInt value) {
             // lost magnitude is ok here.
             int initValue = value.intValue();
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
-            return ((long) computeAdler32(array, initValue) & 0xFFFFFFFFL);
+            return computeAdler32(array, initValue) & 0xFFFFFFFFL;
         }
 
         @Specialization
@@ -358,7 +358,7 @@ public long doObject(PIBytesLike data, Object value,
         }
 
         @Fallback
-        public long doObject(Object data, Object value) {
+        public long doObject(Object data, @SuppressWarnings("unused") Object value) {
             throw raise(TypeError, "a bytes-like object is required, not '%p'", data);
         }
 
@@ -399,7 +399,7 @@ private static byte[] compress(byte[] input, int level) {
         }
 
         @Specialization
-        public PBytes doit(PIBytesLike data, PNone level) {
+        public PBytes doit(PIBytesLike data, @SuppressWarnings("unused") PNone level) {
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
             return factory().createBytes(compress(array, -1));
         }
@@ -470,7 +470,7 @@ private byte[] decompress(byte[] input, @SuppressWarnings("unused") int wbits, i
 
         @Specialization
         @TruffleBoundary
-        public PBytes doit(PIBytesLike data, PNone wbits, PNone bufsize) {
+        public PBytes doit(PIBytesLike data, @SuppressWarnings("unused") PNone wbits, @SuppressWarnings("unused") PNone bufsize) {
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
             return factory().createBytes(decompress(array, MAX_WBITS, DEF_BUF_SIZE));
         }
@@ -485,11 +485,9 @@ public PBytes decompress(PIBytesLike data, long wbits, int bufsize) {
             // checking bufsize
             if (bufSizeProfile.profile(bufsize < 0)) {
                 throw raise(ZLibError, "bufsize must be non-negative");
-            } else if (bufsize == 0) {
-                bufsize = 1;
             }
             byte[] array = getToArrayNode().execute(data.getSequenceStorage());
-            return factory().createBytes(decompress(array, (int) wbits, bufsize));
+            return factory().createBytes(decompress(array, (int) wbits, bufsize == 0 ? 1 : bufsize));
         }
 
         @Specialization