Merge 4c528dd into 2b06b77

mopidy · Jul 27, 2015 · 15aecbf · 15aecbf
2 parents 2b06b77 + 4c528dd
commit 15aecbf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/mopidy/internal/path.py b/mopidy/internal/path.py
@@ -192,7 +192,7 @@ def _find(root, thread_count=10, relative=False, follow=False):
 
 def find_mtimes(root, follow=False):
     results, errors = _find(root, relative=False, follow=follow)
-    mtimes = dict((f, int(st.st_mtime * 1000)) for f, st in results.items())
+    mtimes = dict((f, int(st.st_mtime) * 1000) for f, st in results.items())
     return mtimes, errors
 
 

diff --git a/tests/__init__.py b/tests/__init__.py
@@ -32,6 +32,6 @@ def __repr__(self):
         return str(self.klass)
 
 
-any_int = IsA(int)
+any_int = IsA((int, long))
 any_str = IsA(str)
 any_unicode = IsA(compat.text_type)
diff --git a/tests/core/test_history.py b/tests/core/test_history.py
@@ -40,7 +40,7 @@ def test_history_entry_contents(self):
         result = self.history.get_history()
         (timestamp, ref) = result[0]
 
-        self.assertIsInstance(timestamp, int)
+        self.assertIsInstance(timestamp, (int, long))
         self.assertEqual(track.uri, ref.uri)
         self.assertIn(track.name, ref.name)
         for artist in track.artists: