Rebase master

Author: MarcCote

smartdispatch/tests/test_filelock.py

@@ -38,9 +38,9 @@ def _test_open_with_lock(lock_func):
         time.sleep(1)
 
     stdout, stderr = process.communicate()
-    assert_equal(stdout, "")
-    assert_true("Traceback" not in stderr, msg="Unexpected error: '{}'".format(stderr))
-    assert_true("write-lock" in stderr, msg="Forcing a race condition, try increasing sleeping time above.")
+    assert_equal(stdout, b"")
+    assert_true("Traceback" not in stderr.decode(), msg="Unexpected error: '{}'".format(stderr.decode()))
+    assert_true("write-lock" in stderr.decode(), msg="Forcing a race condition, try increasing sleeping time above.")
 
     shutil.rmtree(temp_dir)  # Cleaning up.