Merge pull request #70 from Rafiot/master

Update travis config

Author: Changaco

.travis.yml

@@ -1,5 +1,10 @@
 language: python
-python: "3.6"
+matrix:
+  include:
+    - python: 3.5
+      env: TOXENV=py27,py34,py35
+    - python: 3.6
+      env: TOXENV=py36
 
 branches:
   only:
@@ -16,8 +21,8 @@ env:
 before_install:
   - sudo apt-get install -y zlib1g-dev liblzma-dev libbz2-dev libxml2-dev nettle-dev libattr1-dev libacl1-dev
   - "if [ ! -e $LIBARCHIVE ]; then
-        wget http://libarchive.org/downloads/libarchive-3.1.2.tar.gz &&
-        tar -xf libarchive-3.1.2.tar.gz && cd libarchive-3.1.2 &&
+        wget http://libarchive.org/downloads/libarchive-3.3.2.tar.gz &&
+        tar -xf libarchive-3.3.2.tar.gz && cd libarchive-3.3.2 &&
         ./configure --prefix=/opt/python-libarchive-c --disable-bsdcpio --disable-bsdtar &&
         make && sudo make install && cd .. ;
     fi"

libarchive/__init__.py

@@ -1,7 +1,9 @@
 from .entry import ArchiveEntry
 from .exception import ArchiveError
 from .extract import extract_fd, extract_file, extract_memory
-from .read import custom_reader, fd_reader, file_reader, memory_reader, stream_reader
+from .read import (
+    custom_reader, fd_reader, file_reader, memory_reader, stream_reader
+)
 from .write import custom_writer, fd_writer, file_writer, memory_writer
 
 __all__ = [

libarchive/read.py

@@ -96,8 +96,11 @@ def memory_reader(buf, format_name='all', filter_name='all'):
 
 
 @contextmanager
-def stream_reader(stream, format_name='all', filter_name='all', block_size=page_size):
-    """Read an archive from a stream (an object supporting the `readinto` method).
+def stream_reader(stream, format_name='all', filter_name='all',
+                  block_size=page_size):
+    """Read an archive from a stream.
+
+    The `stream` object must support the standard `readinto` method.
     """
     buf = create_string_buffer(block_size)
     buf_p = cast(buf, c_void_p)

libarchive/write.py

@@ -118,7 +118,7 @@ def new_archive_write(format_name, filter_name=None):
         yield archive_p
         ffi.write_close(archive_p)
         ffi.write_free(archive_p)
-    except:
+    except Exception:
         ffi.write_fail(archive_p)
         ffi.write_free(archive_p)
         raise

tests/data/testtar.tar.json

@@ -608,7 +608,7 @@
     "mode": "rw-r--r--", 
     "mtime": 1041808783, 
     "path": "pax/regtype4", 
-    "size": 0, 
+    "size": 7011, 
     "uid": 123
   }, 
   {
@@ -662,4 +662,4 @@
     "size": 0, 
     "uid": 1000
   }
-]
+]

tox.ini

@@ -1,20 +1,16 @@
 [tox]
-envlist=lint,py27,py34,py35,py36
+envlist=py27,py34,py35,py36
 skipsdist=True
 
 [testenv]
 passenv = LIBARCHIVE
 commands=
     python -m pytest -vv --boxed --cov libarchive --cov-report term-missing {toxinidir}/tests {posargs}
+    flake8 {toxinidir}
 deps=
+    flake8
     pytest
     pytest-cov
     pytest-xdist
     six
     mock
-
-[testenv:lint]
-commands=
-    flake8 {toxinidir}
-deps=
-    flake8