modified time can be a long.

Fixes plone.namedfile and plone.app.imaging tests.

plone/scale/storage.py

@@ -18,6 +18,15 @@
 # This is one day:
 KEEP_SCALE_MILLIS = 24 * 60 * 60 * 1000
 
+try:
+    long
+except NameError:
+    # Python 3 has no long, only int.
+    number_types = (float, int)
+else:
+    # Python 2
+    number_types = (float, int, long)
+
 
 class IImageScaleStorage(Interface):
     """ This is an adapter for image content which can store, retrieve and
@@ -118,12 +127,12 @@ def _modified_since(self, since, offset=0):
         modified_time = self.modified_time
         if modified_time is None:
             return False
-        # We expect either a float or an int, but in corner cases it can be
+        # We expect a number, but in corner cases it can be
         # something else entirely.
         # https://github.com/plone/plone.scale/issues/12
-        if not isinstance(modified_time, (float, int)):
+        if not isinstance(modified_time, number_types):
             return False
-        if not isinstance(since, (float, int)):
+        if not isinstance(since, number_types):
             return False
         since = since - offset
         return modified_time > since
@@ -234,7 +243,7 @@ def _cleanup(self):
         modified_time = self.modified_time
         if modified_time is None:
             return
-        if not isinstance(modified_time, (float, int)):
+        if not isinstance(modified_time, number_types):
             # https://github.com/plone/plone.scale/issues/12
             return
         for key, value in storage.items():