Merge pull request #6 from rhpvorderman/tests

Add compliance tests

Author: rhpvorderman

CHANGELOG.rst

@@ -9,6 +9,8 @@ Changelog
 
 version 0.1.0-dev
 -----------------
++ Add compliance tests from CPython to ensure isal_zlib and igzip are validated
+  to the same standards as the zlib and gzip modules.
 + Added a working gzip app using ``python -m isal.igzip``
 + Add test suite that tests all possible settings for functions on the
   isal_zlib module.

setup.py

@@ -23,7 +23,7 @@
 
 from setuptools import Extension, find_packages, setup
 
-EXTENSION_OPTS = dict(compiler_directives={})
+EXTENSION_OPTS = dict()
 
 # Make sure conda prefix is loaded if installed in a conda environment.
 CONDA_PREFIX = os.environ.get("CONDA_PREFIX")

src/isal/igzip.py

@@ -28,10 +28,11 @@
 import os
 
 import _compression
+import sys
 
 from . import isal_zlib
 
-__all__ = ["IGzipFile", "open", "compress", "decompress"]
+__all__ = ["IGzipFile", "open", "compress", "decompress", "BadGzipFile"]
 
 _COMPRESS_LEVEL_FAST = isal_zlib.ISAL_BEST_SPEED
 _COMPRESS_LEVEL_TRADEOFF = isal_zlib.ISAL_DEFAULT_COMPRESSION
@@ -40,6 +41,9 @@
 
 BUFFER_SIZE = _compression.BUFFER_SIZE
 
+class BadGzipFile(OSError):
+    pass
+
 
 # The open method was copied from the python source with minor adjustments.
 def open(filename, mode="rb", compresslevel=_COMPRESS_LEVEL_TRADEOFF,
@@ -225,7 +229,7 @@ def main():
     parser.description = (
         "A simple command line interface for the igzip module. "
         "Acts like igzip.")
-    parser.add_argument("file")
+    parser.add_argument("file", nargs="?")
     compress_group = parser.add_mutually_exclusive_group()
     compress_group.add_argument(
         "-0", "--fast", action="store_const", dest="compresslevel",
@@ -251,24 +255,37 @@ def main():
 
     compresslevel = args.compresslevel or _COMPRESS_LEVEL_TRADEOFF
 
-    if args.compress:
-        out_filename = args.file + ".gz"
-        out_open = functools.partial(open, compresslevel=compresslevel)
-        in_open = io.open
+    if args.file is None:
+        if args.compress:
+            in_file = sys.stdin.buffer
+            out_file = IGzipFile(mode="wb", compresslevel=compresslevel,
+                                 fileobj=sys.stdout.buffer)
+        else:
+            in_file = IGzipFile(mode="rb", fileobj=sys.stdin.buffer)
+            out_file = sys.stdout.buffer
     else:
-        base, extension = os.path.splitext(args.file)
-        if extension != ".gz":
-            raise ValueError("Can only decompress files with a .gz extension")
-        out_filename = base
-        out_open = io.open
-        in_open = open
-    with in_open(args.file, "rb") as in_file:
-        with out_open(out_filename, "wb") as out_file:
-            while True:
-                block = in_file.read(_BLOCK_SIZE)
-                if block == b"":
-                    break
-                out_file.write(block)
+        if args.compress:
+            in_file = io.open(args.file, mode="rb")
+            out_file = open(args.file + ".gz", mode="wb",
+                            compresslevel=compresslevel)
+        else:
+            base, extension = os.path.splitext(args.file)
+            if extension != ".gz":
+                print(f"filename doesn't end in .gz: {args.file}")
+                return
+            in_file = open(args.file, "rb")
+            out_file = io.open(base, "wb")
+    try:
+        while True:
+            block = in_file.read(_BLOCK_SIZE)
+            if block == b"":
+                break
+            out_file.write(block)
+    finally:
+        if in_file is not sys.stdin.buffer:
+            in_file.close()
+        if out_file is not sys.stdout.buffer:
+            out_file.close()
 
 
 if __name__ == "__main__":