Merge branch 'expobrain-python2'

Author: Benedikt Schmitt

test.py

@@ -34,6 +34,7 @@
 import sys
 import unittest
 import threading
+import errno
 
 import filelock
 
@@ -82,16 +83,20 @@ def setUp(self):
         """Deletes the potential lock file at :attr:`LOCK_PATH`."""
         try:
             os.remove(self.LOCK_PATH)
-        except FileNotFoundError:
-            pass
+        except OSError as e:
+            # FileNotFound
+            if e.errno != errno.ENOENT:
+                raise
         return None
 
     def tearDown(self):
         """Deletes the potential lock file at :attr:`LOCK_PATH`."""
         try:
             os.remove(self.LOCK_PATH)
-        except OSError:
-            pass
+        except OSError as e:
+            # FileNotFound
+            if e.errno != errno.ENOENT:
+                raise
         return None
 
     def test_simple(self):