py3 is pickier about comparisons in sorted

Author: jettero

hubblestack/hec/dq.py

@@ -49,6 +49,22 @@ def __bool__(self):
         return False
     __nonzero__ = __bool__ # stupid python2
 
+def numbered_file_split_key(x):
+    """ for sorting purposes, split filenames like '238048.11', '238048.17',
+        '238048.0' into lists of integers.  E.g.:
+
+        for fname in sorted(filenames, key=numbered_file_split_key):
+            do_things_ordered_by_integer_sort()
+    """
+    try:
+        return [int(i) for i in x.split('.')]
+    except:
+        pass
+    try:
+        return [int(x)]
+    except:
+        pass
+    return list()
 
 class DiskQueue(OKTypesMixin):
     sep = b' '
@@ -235,14 +251,8 @@ def pop(self):
     @property
     def files(self):
         """ generate all filenames in the diskqueue (returns iterable) """
-        def _k(x):
-            try:
-                return [int(i) for i in x.split('.')]
-            except:
-                pass
-            return x
         for path, dirs, files in sorted(os.walk(self.directory)):
-            for fname in [os.path.join(path, f) for f in sorted(files, key=_k)]:
+            for fname in [os.path.join(path, f) for f in sorted(files, key=numbered_file_split_key)]:
                 if fname.endswith('.meta'):
                     continue
                 yield fname