@@ -8,3 +8,4 @@ pbr
 tenacity
 tqdm
 requests>2,<3
+scandir
@@ -10,6 +10,11 @@
 import uuid
 import time
 
+try:
+  from os import scandir
+except ImportError:
+  from scandir import scandir
+
 import tenacity
 
 from .registered_task import totask, totaskid
@@ -272,7 +277,7 @@ def cancel_lease(self, task):
   def release_all(self):
     """Voids all leases and sets all tasks to available."""
     now = nowfn()
-    for file in os.scandir(self.queue_path):
+    for file in scandir(self.queue_path):
       if get_timestamp(file.name) < now:
         continue
 
@@ -319,7 +324,7 @@ def fmt(direntry):
       return (int(timestamp), filename)
 
     now = nowfn()
-    files = ( fmt(direntry) for direntry in os.scandir(self.queue_path) )
+    files = ( fmt(direntry) for direntry in scandir(self.queue_path) )
 
     leasable_files = []
 
@@ -384,8 +389,8 @@ def tally(self):
 
   def purge(self):
     all_files = itertools.chain(
-      os.scandir(self.queue_path), 
-      os.scandir(self.movement_path)
+      scandir(self.queue_path), 
+      scandir(self.movement_path)
     )
     for file in all_files:
       try:
@@ -405,10 +410,10 @@ def read(path):
       with open(path, 'rt') as f:
         return f.read()
 
-    return ( read(f.path) for f in os.scandir(self.queue_path) )
+    return ( read(f.path) for f in scandir(self.queue_path) )
 
   def __len__(self):
-    return functools.reduce(operator.add, ( 1 for f in os.scandir(self.queue_path) ), 0)
+    return functools.reduce(operator.add, ( 1 for f in scandir(self.queue_path) ), 0)