From e35a066d5e9380acc8dea71efcaedd80acd19c98 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 7 Dec 2014 20:25:51 +0100 Subject: [PATCH] py3: Use explicit float or integer division --- mopidy/audio/scan.py | 4 ++-- mopidy/local/commands.py | 5 +++-- mopidy/local/playlists.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mopidy/audio/scan.py b/mopidy/audio/scan.py index b3fe2c4d..55ad6426 100644 --- a/mopidy/audio/scan.py +++ b/mopidy/audio/scan.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, division, unicode_literals import datetime import os @@ -81,7 +81,7 @@ class Scanner(object): def _collect(self): """Polls for messages to collect data.""" start = time.time() - timeout_s = self._timeout_ms / float(1000) + timeout_s = self._timeout_ms / 1000. tags = {} while time.time() - start < timeout_s: diff --git a/mopidy/local/commands.py b/mopidy/local/commands.py index 702626f2..5dacca32 100644 --- a/mopidy/local/commands.py +++ b/mopidy/local/commands.py @@ -1,4 +1,5 @@ -from __future__ import absolute_import, print_function, unicode_literals +from __future__ import ( + absolute_import, division, print_function, unicode_literals) import logging import os @@ -163,6 +164,6 @@ class _Progress(object): logger.info('Scanned %d of %d files in %ds.', self.count, self.total, duration) else: - remainder = duration / self.count * (self.total - self.count) + remainder = duration // self.count * (self.total - self.count) logger.info('Scanned %d of %d files in %ds, ~%ds left.', self.count, self.total, duration, remainder) diff --git a/mopidy/local/playlists.py b/mopidy/local/playlists.py index 1496867c..deeae2b5 100644 --- a/mopidy/local/playlists.py +++ b/mopidy/local/playlists.py @@ -1,4 +1,4 @@ -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import, division, unicode_literals import glob import logging @@ -92,7 +92,7 @@ class LocalPlaylistsProvider(backend.PlaylistsProvider): def _write_m3u_extinf(self, file_handle, track): title = track.name.encode('latin-1', 'replace') - runtime = track.length / 1000 if track.length else -1 + runtime = track.length // 1000 if track.length else -1 file_handle.write('#EXTINF:' + str(runtime) + ',' + title + '\n') def _save_m3u(self, playlist):