diff --git a/beet b/beet index 9b6b0cabc..742dd2a36 100755 --- a/beet +++ b/beet @@ -15,7 +15,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import print_function +from __future__ import absolute_import, print_function import beets.ui diff --git a/beets/art.py b/beets/art.py index f225c1c09..9012db00e 100644 --- a/beets/art.py +++ b/beets/art.py @@ -17,7 +17,7 @@ music and items' embedded album art. """ -from __future__ import print_function +from __future__ import absolute_import, print_function import subprocess import platform diff --git a/beetsplug/cue.py b/beetsplug/cue.py index b207a4223..d6865b4f2 100644 --- a/beetsplug/cue.py +++ b/beetsplug/cue.py @@ -2,7 +2,7 @@ # Copyright 2016 Bruno Cauet # Split an album-file in tracks thanks a cue file -from __future__ import print_function +from __future__ import absolute_import, print_function import subprocess from os import path diff --git a/beetsplug/filefilter.py b/beetsplug/filefilter.py index f706723fd..437b66d9a 100644 --- a/beetsplug/filefilter.py +++ b/beetsplug/filefilter.py @@ -16,7 +16,7 @@ """Filter imported files using a regular expression. """ -from __future__ import print_function +from __future__ import absolute_import, print_function import re from beets import config diff --git a/beetsplug/ipfs.py b/beetsplug/ipfs.py index cf58d112c..119d857c8 100644 --- a/beetsplug/ipfs.py +++ b/beetsplug/ipfs.py @@ -15,7 +15,7 @@ """Adds support for ipfs. Requires go-ipfs and a running ipfs daemon """ -from __future__ import print_function +from __future__ import absolute_import, print_function from beets import ui, util, library, config from beets.plugins import BeetsPlugin diff --git a/beetsplug/metasync/__init__.py b/beetsplug/metasync/__init__.py index 50c1f3ebb..a7ed292ce 100644 --- a/beetsplug/metasync/__init__.py +++ b/beetsplug/metasync/__init__.py @@ -16,7 +16,7 @@ """Synchronize information from music player libraries """ -from __future__ import print_function +from __future__ import absolute_import, print_function from abc import abstractmethod, ABCMeta from importlib import import_module diff --git a/beetsplug/metasync/amarok.py b/beetsplug/metasync/amarok.py index 97cfb8532..8d657b564 100644 --- a/beetsplug/metasync/amarok.py +++ b/beetsplug/metasync/amarok.py @@ -16,7 +16,7 @@ """Synchronize information from amarok's library via dbus """ -from __future__ import print_function +from __future__ import absolute_import, print_function from os.path import basename from datetime import datetime diff --git a/beetsplug/metasync/itunes.py b/beetsplug/metasync/itunes.py index 3c132e9d8..4e67193bc 100644 --- a/beetsplug/metasync/itunes.py +++ b/beetsplug/metasync/itunes.py @@ -16,7 +16,7 @@ """Synchronize information from iTunes's library """ -from __future__ import print_function +from __future__ import absolute_import, print_function from contextlib import contextmanager import os diff --git a/docs/conf.py b/docs/conf.py index 986e42dcf..6d58a8135 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import print_function +from __future__ import absolute_import, print_function AUTHOR = u'Adrian Sampson' diff --git a/docs/serve.py b/docs/serve.py index facaf8fe6..0920f9374 100644 --- a/docs/serve.py +++ b/docs/serve.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -from __future__ import print_function +from __future__ import absolute_import, print_function from livereload import Server, shell diff --git a/test/__init__.py b/test/__init__.py index 1582876d6..4de37e268 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -2,4 +2,4 @@ # Make python -m testall.py work. -from __future__ import print_function +from __future__ import absolute_import, print_function diff --git a/test/test_filefilter.py b/test/test_filefilter.py index 0375e4499..a3a3e212f 100644 --- a/test/test_filefilter.py +++ b/test/test_filefilter.py @@ -16,19 +16,19 @@ """Tests for the `filefilter` plugin. """ -from __future__ import print_function +from __future__ import absolute_import, print_function import os import shutil -from _common import unittest +from test import _common +from test._common import unittest +from test.helper import capture_log +from test.test_importer import ImportHelper from beets import config from beets.mediafile import MediaFile from beets.util import displayable_path from beetsplug.filefilter import FileFilterPlugin -from test import _common -from test.helper import capture_log -from test.test_importer import ImportHelper class FileFilterPluginTest(unittest.TestCase, ImportHelper): diff --git a/test/test_ipfs.py b/test/test_ipfs.py index 67a6e9c29..a261590b1 100644 --- a/test/test_ipfs.py +++ b/test/test_ipfs.py @@ -12,7 +12,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import print_function +from __future__ import absolute_import, print_function from mock import patch diff --git a/test/test_metasync.py b/test/test_metasync.py index 19e50ee13..dce66b218 100644 --- a/test/test_metasync.py +++ b/test/test_metasync.py @@ -13,7 +13,7 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from __future__ import print_function +from __future__ import absolute_import, print_function import os import platform diff --git a/test/test_ui_commands.py b/test/test_ui_commands.py index a89e29d01..6347bc312 100644 --- a/test/test_ui_commands.py +++ b/test/test_ui_commands.py @@ -16,7 +16,7 @@ """Test module for file ui/commands.py """ -from __future__ import print_function +from __future__ import absolute_import, print_function import os import shutil diff --git a/test/test_ui_init.py b/test/test_ui_init.py index 14e53977f..457655907 100644 --- a/test/test_ui_init.py +++ b/test/test_ui_init.py @@ -16,7 +16,7 @@ """Test module for file ui/__init__.py """ -from __future__ import print_function +from __future__ import absolute_import, print_function from test import _common from test._common import unittest