Updated path traversal link, changed pip installs

.travis.yml

@@ -1,13 +1,15 @@
 language: python
 
 python:
-    - "2.7_with_system_site_packages"
+    - 2.7_with_system_site_packages
-    - "3.3"
+    - 2.7.11
-    - "3.4"
+    # - 3.3
-    - "3.5"
+    # - 3.4
-    - "nightly"
+    # - 3.5
+    # - nightly
 
 sudo: required
+# do we need sudo? should double check
 
 dist: trusty
 
@@ -44,18 +46,16 @@ install:
     - sudo apt-get install libxml2-dev libxslt1-dev
     - wget https://didierstevens.com/files/software/pdfid_v0_2_1.zip
     - unzip pdfid_v0_2_1.zip
+    - pip install -U pip
+    - pip install lxml exifread pillow
+    - pip install git+https://github.com/Rafiot/officedissector.git
     - |
-      if [[ "$TRAVIS_PYTHON_VERSION" == "2.7_with_system_site_packages" ]]; then
+      if [[ "$TRAVIS_PYTHON_VERSION" == 2*  ]]; then
-        sudo pip install -U pip lxml exifread pillow
+        pip install -U oletools olefile
-        sudo pip install -U git+https://github.com/Rafiot/officedissector.git
-        sudo pip install -U oletools olefile coveralls codecov pytest-cov
-      else
-        pip install -U pip lxml exifread pillow
-        pip install -U git+https://github.com/Rafiot/officedissector.git
-        pip install -U coveralls codecov pytest-cov
       fi
     # Module dependencies
     - pip install -r dev-requirements.txt
+    - pip install coveralls codecov
     # Testing dependencies
     - sudo apt-get install rar
     # Prepare tests
@@ -65,18 +65,18 @@ install:
     - python unpackall.py
     - popd
     - mv theZoo/malwares/Binaries/out tests/src_complex/
-    # path traversal
+    # Path traversal
-    # - hg clone https://bitbucket.org/jwilk/path-traversal-samples
+    - git clone https://github.com/jwilk/path-traversal-samples
-    # - pushd path-traversal-samples
+    - pushd path-traversal-samples
-    # - pushd zip
+    - pushd zip
-    # - make
+    - make
-    # - popd
+    - popd
-    # - pushd rar
+    - pushd rar
-    # - make
+    - make
-    # - popd
+    - popd
-    # - popd
+    - popd
-    # - mv path-traversal-samples/zip/*.zip tests/src_complex/
+    - mv path-traversal-samples/zip/*.zip tests/src_complex/
-    # - mv path-traversal-samples/rar/*.rar tests/src_complex/
+    - mv path-traversal-samples/rar/*.rar tests/src_complex/
     # Office docs
     - git clone https://github.com/eea/odfpy.git
     - mv odfpy/tests/examples/* tests/src_complex/

bin/filecheck.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 import os
+import sys
 import mimetypes
 import shlex
 import subprocess
@@ -21,6 +22,7 @@ from pdfid import PDFiD, cPDFiD
 from kittengroomer import FileBase, KittenGroomerBase, main
 
 SEVENZ = '/usr/bin/7z'
+PY3 = sys.version_info.major == 3
 
 
 # Prepare application/<subtype>