Fixed sanity check for Python 3.5

flamenco_worker/cli.py

@@ -210,8 +210,8 @@ def parse_pretask_check_config(confparser, log):
     """
     from . import worker
 
-    check_read: typing.List[pathlib.Path] = []
-    check_write: typing.List[pathlib.Path] = []
+    check_read = []
+    check_write = []
     for name, value in confparser.items(section='pre_task_check'):
         if name.startswith('write'):
             check_write.append(pathlib.Path(value))

flamenco_worker/worker.py

@@ -47,10 +47,10 @@ class WorkerState(enum.Enum):
     SHUTTING_DOWN = 'shutting-down'
 
 
-@attr.s(auto_attribs=True)
+@attr.s()
 class PreTaskCheckParams:
-    pre_task_check_write: typing.Tuple[pathlib.Path] = ()
-    pre_task_check_read: typing.Tuple[pathlib.Path] = ()
+    pre_task_check_write = attr.ib(validator=attr.validators.instance_of(tuple), factory=tuple)
+    pre_task_check_read = attr.ib(validator=attr.validators.instance_of(tuple), factory=tuple)
 
 
 class PreTaskCheckFailed(PermissionError):
@@ -784,13 +784,15 @@ class FlamencoWorker:
                 raise PreTaskCheckFailed('%s does not exist' % read_path) from None
             if read_path.is_dir():
                 try:
-                    # Globbing an unreadable/nonexistant directory just
-                    # returns an empty iterator. Globbing something nonexistant
-                    # inside a non-readable directory raises a PermissionError.
-                    glob = (read_path / 'anything').glob('*')
-                    list(itertools.islice(glob, 1))
+                    (read_path / 'anything').stat()
                 except PermissionError:
                     raise PreTaskCheckFailed('%s is not readable' % read_path) from None
+                except FileNotFoundError:
+                    # This is expected.
+                    pass
+                except:
+                    self._log.exception('Unexpected shit happened')
+                    raise SystemExit(44)
             else:
                 try:
                     with read_path.open(mode='r') as the_file:
@@ -811,7 +813,7 @@ class FlamencoWorker:
             post_delete = False
             try:
                 if write_path.is_dir():
-                    testfile = tempfile.TemporaryFile('w', dir=write_path)
+                    testfile = tempfile.TemporaryFile('w', dir=str(write_path))
                 else:
                     post_delete = not write_path.exists()
                     testfile = write_path.open('a+')