Merge branch '1.0.x' into 'master'

.travis.yml

@@ -15,12 +15,12 @@ after_success: .travis/finish.sh
 matrix:
   include:
     - dist: trusty
-      python: "2.7"
+      python: "3.6"
       env: TEST_MODE=checks
     - dist: trusty
-      python: "2.7"
+      python: "3.6"
       env: TEST_MODE=coverage
   exclude:
     # This is already tested by coverage
-    - python: "2.7"
+    - python: "3.6"
       env: TEST_MODE=run_program

.travis/install.sh

@@ -5,11 +5,6 @@ set -eux
 # Update things
 pip install -U setuptools pip
 
-# Fix 'cryptography' on Python 3.3 (though they don't support it officially)
-if [ $TRAVIS_PYTHON_VERSION = 3.3 ]; then
-    pip install enum34
-fi
-
 # Use a plain-ASCII locale, to make sure to catch stupid PY3 behaviors
 export LANG=C
 export LC_ALL=C

README.md

@@ -4,7 +4,7 @@
 [![Matrix](https://img.shields.io/badge/chat-matrix.org-blue.svg)](https://riot.im/app/#/room/#reprozip:matrix.org)
 [![Say Thanks!](https://img.shields.io/badge/Say%20Thanks-!-1EAEDB.svg)](https://saythanks.io/to/remram44)
 [![status](https://img.shields.io/badge/JOSS-10.21105%2Fjoss.00107-green.svg)](http://joss.theoj.org/papers/b578b171263c73f64dfb9d040ca80fe0)
-[![DOI](https://img.shields.io/badge/DOI/10.5281%2Fzenodo.2558333-green.svg)](https://doi.org/10.5281/zenodo.2558333
+[![DOI](https://img.shields.io/badge/DOI/10.5281%2Fzenodo.2558333-green.svg)](https://doi.org/10.5281/zenodo.2558333)
 
 ReproZip
 ========

reprounzip/reprounzip/unpackers/common/x11.py

@@ -71,7 +71,7 @@ def from_file(cls, fp):
         address_length = _read_short(fp)
         address = fp.read(address_length)
         number_length = _read_short(fp)
-        number = int(fp.read(number_length))
+        number = int(fp.read(number_length)) if number_length else None
         name_length = _read_short(fp)
         name = fp.read(name_length)
         data_length = _read_short(fp)
@@ -168,14 +168,18 @@ def __init__(self, enabled, target, display=None):
                     if (entry.name == 'MIT-MAGIC-COOKIE-1' and
                             entry.number == local_display):
                         if entry.family == Xauth.FAMILY_LOCAL:
+                            logger.debug("Found cookie for local connection")
                             xauth_entries[(entry.family, None)] = entry
                         elif (entry.family == Xauth.FAMILY_INTERNET or
                                 entry.family == Xauth.FAMILY_INTERNET6):
+                            logger.debug("Found cookie for %r",
+                                         (entry.family, entry.address))
                             xauth_entries[(entry.family,
                                            entry.address)] = entry
-        # FIXME: this completely ignores addresses
+        else:
+            logger.debug("No Xauthority file")
 
-        logger.debug("Possible X endpoints: %s", (possible,))
+        logger.debug("Possible X endpoints: %s", possible)
 
         # Select socket and authentication cookie
         self.xauth_record = None
@@ -209,6 +213,7 @@ def __init__(self, enabled, target, display=None):
         # Didn't find an Xauthority record -- assume no authentication is
         # needed, but still set self.connection_info
         if self.connection_info is None:
+            logger.debug("Didn't find any matching Xauthority entry")
             for family, address in possible:
                 # Only try UNIX sockets, we'll use 127.0.0.1 otherwise
                 if family == Xauth.FAMILY_LOCAL: