From 30f158a95e1bd264592c786e8a6d5083e929061d Mon Sep 17 00:00:00 2001 From: Bruno Cauet Date: Mon, 5 Jan 2015 10:05:21 +0100 Subject: [PATCH] Move "from beets import logging" statements Move the import next to other beets-related imports --- beets/autotag/__init__.py | 2 +- beets/autotag/hooks.py | 2 +- beets/autotag/match.py | 2 +- beets/autotag/mb.py | 2 +- beets/importer.py | 2 +- beets/library.py | 3 ++- beets/mediafile.py | 2 +- beets/plugins.py | 2 +- beets/ui/__init__.py | 2 +- beets/ui/commands.py | 2 +- beets/util/artresizer.py | 1 + beetsplug/beatport.py | 2 +- beetsplug/bpd/__init__.py | 2 +- beetsplug/bpm.py | 3 +-- beetsplug/bucket.py | 3 ++- beetsplug/chroma.py | 2 +- beetsplug/convert.py | 3 +-- beetsplug/discogs.py | 2 +- beetsplug/duplicates.py | 2 +- beetsplug/echonest.py | 3 +-- beetsplug/embedart.py | 2 +- beetsplug/fetchart.py | 2 +- beetsplug/freedesktop.py | 2 +- beetsplug/ftintitle.py | 3 ++- beetsplug/importadded.py | 2 +- beetsplug/importfeeds.py | 3 +-- beetsplug/info.py | 2 +- beetsplug/inline.py | 3 +-- beetsplug/keyfinder.py | 2 +- beetsplug/lastgenre/__init__.py | 2 +- beetsplug/lastimport.py | 2 +- beetsplug/lyrics.py | 2 +- beetsplug/mbcollection.py | 2 +- beetsplug/mbsync.py | 4 +--- beetsplug/missing.py | 1 - beetsplug/mpdstats.py | 2 +- beetsplug/play.py | 2 +- beetsplug/replaygain.py | 2 +- beetsplug/rewrite.py | 2 +- beetsplug/scrub.py | 2 +- beetsplug/spotify.py | 3 +-- test/_common.py | 3 +-- test/helper.py | 2 +- 43 files changed, 45 insertions(+), 51 deletions(-) diff --git a/beets/autotag/__init__.py b/beets/autotag/__init__.py index cf7048008..3fa98758c 100644 --- a/beets/autotag/__init__.py +++ b/beets/autotag/__init__.py @@ -14,8 +14,8 @@ """Facilities for automatically determining files' correct metadata. """ -from beets import logging +from beets import logging from beets import config # Parts of external interface. diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py index 43433a2cd..5118212b4 100644 --- a/beets/autotag/hooks.py +++ b/beets/autotag/hooks.py @@ -13,10 +13,10 @@ # included in all copies or substantial portions of the Software. """Glue between metadata sources and the matching logic.""" -from beets import logging from collections import namedtuple import re +from beets import logging from beets import plugins from beets import config from beets.autotag import mb diff --git a/beets/autotag/match.py b/beets/autotag/match.py index 39a788c74..d51cd4fb1 100644 --- a/beets/autotag/match.py +++ b/beets/autotag/match.py @@ -18,10 +18,10 @@ releases and tracks. from __future__ import division import datetime -from beets import logging import re from munkres import Munkres +from beets import logging from beets import plugins from beets import config from beets.util import plurality diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py index e0f6088f6..7c598a17f 100644 --- a/beets/autotag/mb.py +++ b/beets/autotag/mb.py @@ -14,12 +14,12 @@ """Searches for albums in the MusicBrainz database. """ -from beets import logging import musicbrainzngs import re import traceback from urlparse import urljoin +from beets import logging import beets.autotag.hooks import beets from beets import util diff --git a/beets/importer.py b/beets/importer.py index f3b8975c5..a0f100749 100644 --- a/beets/importer.py +++ b/beets/importer.py @@ -19,7 +19,6 @@ from __future__ import print_function import os import re -from beets import logging import pickle import itertools from collections import defaultdict @@ -28,6 +27,7 @@ from bisect import insort, bisect_left from contextlib import contextmanager import shutil +from beets import logging from beets import autotag from beets import library from beets import dbcore diff --git a/beets/library.py b/beets/library.py index e97d335de..180f029cb 100644 --- a/beets/library.py +++ b/beets/library.py @@ -16,12 +16,13 @@ """ import os import sys -from beets import logging import shlex import unicodedata import time import re from unidecode import unidecode + +from beets import logging from beets.mediafile import MediaFile, MutagenError, UnreadableFileError from beets import plugins from beets import util diff --git a/beets/mediafile.py b/beets/mediafile.py index 1bee05e5e..3e3d2aa23 100644 --- a/beets/mediafile.py +++ b/beets/mediafile.py @@ -48,10 +48,10 @@ import math import struct import imghdr import os -from beets import logging import traceback import enum +from beets import logging from beets.util import displayable_path diff --git a/beets/plugins.py b/beets/plugins.py index 917baf8a1..a975145db 100755 --- a/beets/plugins.py +++ b/beets/plugins.py @@ -14,7 +14,6 @@ """Support for beets plugins.""" -from beets import logging import traceback import inspect import re @@ -22,6 +21,7 @@ from collections import defaultdict import beets +from beets import logging from beets import mediafile PLUGIN_NAMESPACE = 'beetsplug' diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py index 09dec6a78..a69b98ac2 100644 --- a/beets/ui/__init__.py +++ b/beets/ui/__init__.py @@ -23,7 +23,6 @@ import optparse import textwrap import sys from difflib import SequenceMatcher -from beets import logging import sqlite3 import errno import re @@ -31,6 +30,7 @@ import struct import traceback import os.path +from beets import logging from beets import library from beets import plugins from beets import util diff --git a/beets/ui/commands.py b/beets/ui/commands.py index 5883f37a3..8de9ab1bc 100644 --- a/beets/ui/commands.py +++ b/beets/ui/commands.py @@ -17,7 +17,6 @@ interface. """ from __future__ import print_function -from beets import logging import os import time import codecs @@ -37,6 +36,7 @@ from beets.util import syspath, normpath, ancestry, displayable_path from beets.util.functemplate import Template from beets import library from beets import config +from beets import logging from beets.util.confit import _package_path VARIOUS_ARTISTS = u'Various Artists' diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py index 101f5711e..5b51392bd 100644 --- a/beets/util/artresizer.py +++ b/beets/util/artresizer.py @@ -20,6 +20,7 @@ import subprocess import os import re from tempfile import NamedTemporaryFile + from beets import logging from beets import util diff --git a/beetsplug/beatport.py b/beetsplug/beatport.py index c431841cf..39054aab1 100644 --- a/beetsplug/beatport.py +++ b/beetsplug/beatport.py @@ -14,12 +14,12 @@ """Adds Beatport release and track search support to the autotagger """ -from beets import logging import re from datetime import datetime, timedelta import requests +from beets import logging from beets.autotag.hooks import AlbumInfo, TrackInfo, Distance from beets.plugins import BeetsPlugin diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py index e654fa6fd..b0b8ce6c2 100644 --- a/beetsplug/bpd/__init__.py +++ b/beetsplug/bpd/__init__.py @@ -21,13 +21,13 @@ from __future__ import print_function import re from string import Template import traceback -from beets import logging import random import time import beets from beets.plugins import BeetsPlugin import beets.ui +from beets import logging from beets import vfs from beets.util import bluelet from beets.library import Item diff --git a/beetsplug/bpm.py b/beetsplug/bpm.py index d5d324bf7..028af7eae 100644 --- a/beetsplug/bpm.py +++ b/beetsplug/bpm.py @@ -15,9 +15,8 @@ """Determine BPM by pressing a key to the rhythm.""" import time -from beets import logging -from beets import ui +from beets import ui, logging from beets.plugins import BeetsPlugin log = logging.getLogger('beets') diff --git a/beetsplug/bucket.py b/beetsplug/bucket.py index 86ec6be6c..68d520395 100644 --- a/beetsplug/bucket.py +++ b/beetsplug/bucket.py @@ -16,10 +16,11 @@ """ from datetime import datetime -from beets import logging import re import string from itertools import tee, izip + +from beets import logging from beets import plugins, ui log = logging.getLogger('beets') diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py index a339b68a6..485bfba61 100644 --- a/beetsplug/chroma.py +++ b/beetsplug/chroma.py @@ -19,10 +19,10 @@ from beets import plugins from beets import ui from beets import util from beets import config +from beets import logging from beets.util import confit from beets.autotag import hooks import acoustid -from beets import logging from collections import defaultdict API_KEY = '1vOwZtEn' diff --git a/beetsplug/convert.py b/beetsplug/convert.py index cd07dfb22..c9b83c03f 100644 --- a/beetsplug/convert.py +++ b/beetsplug/convert.py @@ -14,7 +14,6 @@ """Converts tracks or albums to external directory """ -from beets import logging import os import threading import subprocess @@ -22,7 +21,7 @@ import tempfile import shlex from string import Template -from beets import ui, util, plugins, config +from beets import logging, ui, util, plugins, config from beets.plugins import BeetsPlugin from beetsplug.embedart import embed_item from beets.util.confit import ConfigTypeError diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py index 17c1b05f9..e3a55fbdd 100644 --- a/beetsplug/discogs.py +++ b/beetsplug/discogs.py @@ -15,6 +15,7 @@ """Adds Discogs album search support to the autotagger. Requires the discogs-client library. """ +from beets import logging from beets.autotag.hooks import AlbumInfo, TrackInfo, Distance from beets.plugins import BeetsPlugin from beets.util import confit @@ -22,7 +23,6 @@ from discogs_client import Release, Client from discogs_client.exceptions import DiscogsAPIError from requests.exceptions import ConnectionError import beets -from beets import logging import re import time import json diff --git a/beetsplug/duplicates.py b/beetsplug/duplicates.py index adbbbcf98..1d7b6f9f1 100644 --- a/beetsplug/duplicates.py +++ b/beetsplug/duplicates.py @@ -15,8 +15,8 @@ """List duplicate tracks or albums. """ import shlex -from beets import logging +from beets import logging from beets.plugins import BeetsPlugin from beets.ui import decargs, print_obj, vararg_callback, Subcommand, UserError from beets.util import command_output, displayable_path, subprocess diff --git a/beetsplug/echonest.py b/beetsplug/echonest.py index 809a3fae2..e38814437 100644 --- a/beetsplug/echonest.py +++ b/beetsplug/echonest.py @@ -15,14 +15,13 @@ """Fetch a variety of acoustic metrics from The Echo Nest. """ import time -from beets import logging import socket import os import tempfile from string import Template import subprocess -from beets import util, config, plugins, ui +from beets import util, config, plugins, ui, logging from beets.dbcore import types import pyechonest import pyechonest.song diff --git a/beetsplug/embedart.py b/beetsplug/embedart.py index b88fcf366..7f04cd1fb 100644 --- a/beetsplug/embedart.py +++ b/beetsplug/embedart.py @@ -14,12 +14,12 @@ """Allows beets to embed album art into file metadata.""" import os.path -from beets import logging import imghdr import subprocess import platform from tempfile import NamedTemporaryFile +from beets import logging from beets.plugins import BeetsPlugin from beets import mediafile from beets import ui diff --git a/beetsplug/fetchart.py b/beetsplug/fetchart.py index dfd4c9017..3b0059817 100644 --- a/beetsplug/fetchart.py +++ b/beetsplug/fetchart.py @@ -15,13 +15,13 @@ """Fetches album art. """ from contextlib import closing -from beets import logging import os import re from tempfile import NamedTemporaryFile import requests +from beets import logging from beets import plugins from beets import importer from beets import ui diff --git a/beetsplug/freedesktop.py b/beetsplug/freedesktop.py index 303394d34..3f3307c82 100644 --- a/beetsplug/freedesktop.py +++ b/beetsplug/freedesktop.py @@ -15,12 +15,12 @@ """Creates freedesktop.org-compliant .directory files on an album level. """ +from beets import logging from beets.plugins import BeetsPlugin from beets.ui import Subcommand from beets.ui import decargs import os -from beets import logging log = logging.getLogger('beets.freedesktop') diff --git a/beetsplug/ftintitle.py b/beetsplug/ftintitle.py index c47ae37c1..f36cfb348 100644 --- a/beetsplug/ftintitle.py +++ b/beetsplug/ftintitle.py @@ -14,12 +14,13 @@ """Moves "featured" artists to the title from the artist field. """ +import re + from beets import plugins from beets import ui from beets.util import displayable_path from beets import config from beets import logging -import re log = logging.getLogger('beets') diff --git a/beetsplug/importadded.py b/beetsplug/importadded.py index 3bc991750..8cb590111 100644 --- a/beetsplug/importadded.py +++ b/beetsplug/importadded.py @@ -6,9 +6,9 @@ Reimported albums and items are skipped. from __future__ import unicode_literals, absolute_import, print_function -from beets import logging import os +from beets import logging from beets import config from beets import util from beets.plugins import BeetsPlugin diff --git a/beetsplug/importfeeds.py b/beetsplug/importfeeds.py index 2697d9eca..4ac1dda2b 100644 --- a/beetsplug/importfeeds.py +++ b/beetsplug/importfeeds.py @@ -19,11 +19,10 @@ one wants to manually add music to a player by its path. import datetime import os import re -from beets import logging from beets.plugins import BeetsPlugin from beets.util import normpath, syspath, bytestring_path -from beets import config +from beets import config, logging M3U_DEFAULT_NAME = 'imported.m3u' log = logging.getLogger('beets') diff --git a/beetsplug/info.py b/beetsplug/info.py index 24930ab52..30cccb1b2 100644 --- a/beetsplug/info.py +++ b/beetsplug/info.py @@ -16,8 +16,8 @@ """ import os -from beets import logging +from beets import logging from beets.plugins import BeetsPlugin from beets import ui from beets import mediafile diff --git a/beetsplug/inline.py b/beetsplug/inline.py index ab886be20..e7e7e0f41 100644 --- a/beetsplug/inline.py +++ b/beetsplug/inline.py @@ -14,12 +14,11 @@ """Allows inline path template customization code in the config file. """ -from beets import logging import traceback import itertools from beets.plugins import BeetsPlugin -from beets import config +from beets import config, logging log = logging.getLogger('beets') diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py index 3f1398850..49830edef 100644 --- a/beetsplug/keyfinder.py +++ b/beetsplug/keyfinder.py @@ -15,9 +15,9 @@ """Uses the `KeyFinder` program to add the `initial_key` field. """ -from beets import logging import subprocess +from beets import logging from beets import ui from beets import util from beets.plugins import BeetsPlugin diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py index 497b0899b..2b4acb590 100644 --- a/beetsplug/lastgenre/__init__.py +++ b/beetsplug/lastgenre/__init__.py @@ -20,11 +20,11 @@ and has been edited to remove some questionable entries. The scraper script used is available here: https://gist.github.com/1241307 """ -from beets import logging import pylast import os import yaml +from beets import logging from beets import plugins from beets import ui from beets.util import normpath, plurality diff --git a/beetsplug/lastimport.py b/beetsplug/lastimport.py index 9f9011dc3..087213031 100644 --- a/beetsplug/lastimport.py +++ b/beetsplug/lastimport.py @@ -12,12 +12,12 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from beets import logging import requests from beets import ui from beets import dbcore from beets import config from beets import plugins +from beets import logging from beets.dbcore import types log = logging.getLogger('beets') diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py index 04e6d38a8..a87715fe3 100644 --- a/beetsplug/lyrics.py +++ b/beetsplug/lyrics.py @@ -17,7 +17,6 @@ from __future__ import print_function import re -from beets import logging import requests import json import unicodedata @@ -26,6 +25,7 @@ import difflib import itertools from HTMLParser import HTMLParseError +from beets import logging from beets import plugins from beets import config, ui diff --git a/beetsplug/mbcollection.py b/beetsplug/mbcollection.py index 9dd90f4cd..764c4529f 100644 --- a/beetsplug/mbcollection.py +++ b/beetsplug/mbcollection.py @@ -16,12 +16,12 @@ from __future__ import print_function from beets.plugins import BeetsPlugin from beets.ui import Subcommand +from beets import logging from beets import ui from beets import config import musicbrainzngs import re -from beets import logging SUBMISSION_CHUNK_SIZE = 200 UUID_REGEX = r'^[a-f0-9]{8}(-[a-f0-9]{4}){3}-[a-f0-9]{12}$' diff --git a/beetsplug/mbsync.py b/beetsplug/mbsync.py index 24823a229..105122639 100644 --- a/beetsplug/mbsync.py +++ b/beetsplug/mbsync.py @@ -14,10 +14,8 @@ """Update library's tags using MusicBrainz. """ -from beets import logging - from beets.plugins import BeetsPlugin -from beets import autotag, library, ui, util +from beets import autotag, library, ui, util, logging from beets.autotag import hooks from beets import config from collections import defaultdict diff --git a/beetsplug/missing.py b/beetsplug/missing.py index 78142e167..2ebe3edf8 100644 --- a/beetsplug/missing.py +++ b/beetsplug/missing.py @@ -15,7 +15,6 @@ """List missing tracks. """ from beets import logging - from beets.autotag import hooks from beets.library import Item from beets.plugins import BeetsPlugin diff --git a/beetsplug/mpdstats.py b/beetsplug/mpdstats.py index 6c0be72c2..5a5d27b4e 100644 --- a/beetsplug/mpdstats.py +++ b/beetsplug/mpdstats.py @@ -13,13 +13,13 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from beets import logging import mpd import socket import select import time import os +from beets import logging from beets import ui from beets import config from beets import plugins diff --git a/beetsplug/play.py b/beetsplug/play.py index 687760ff4..7f9ff3ce9 100644 --- a/beetsplug/play.py +++ b/beetsplug/play.py @@ -16,12 +16,12 @@ """ from beets.plugins import BeetsPlugin from beets.ui import Subcommand +from beets import logging from beets import config from beets import ui from beets import util from os.path import relpath import platform -from beets import logging import shlex from tempfile import NamedTemporaryFile diff --git a/beetsplug/replaygain.py b/beetsplug/replaygain.py index 7d8cc3520..5d50f61c5 100644 --- a/beetsplug/replaygain.py +++ b/beetsplug/replaygain.py @@ -12,7 +12,6 @@ # The above copyright notice and this permission notice shall be # included in all copies or substantial portions of the Software. -from beets import logging import subprocess import os import collections @@ -20,6 +19,7 @@ import itertools import sys import warnings +from beets import logging from beets import ui from beets.plugins import BeetsPlugin from beets.util import syspath, command_output, displayable_path diff --git a/beetsplug/rewrite.py b/beetsplug/rewrite.py index 6a58ff490..8a59bdbfd 100644 --- a/beetsplug/rewrite.py +++ b/beetsplug/rewrite.py @@ -16,10 +16,10 @@ formats. """ import re -from beets import logging from collections import defaultdict from beets.plugins import BeetsPlugin +from beets import logging from beets import ui from beets import library diff --git a/beetsplug/scrub.py b/beetsplug/scrub.py index a6346a2f2..7c5b097cb 100644 --- a/beetsplug/scrub.py +++ b/beetsplug/scrub.py @@ -15,8 +15,8 @@ """Cleans extraneous metadata from files' tags via a command or automatically whenever tags are written. """ -from beets import logging +from beets import logging from beets.plugins import BeetsPlugin from beets import ui from beets import util diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py index 89b4a2d62..704660894 100644 --- a/beetsplug/spotify.py +++ b/beetsplug/spotify.py @@ -2,10 +2,9 @@ from __future__ import print_function import re import webbrowser import requests -from beets import logging from beets.plugins import BeetsPlugin from beets.ui import decargs -from beets import ui +from beets import ui, logging from requests.exceptions import HTTPError log = logging.getLogger('beets') diff --git a/test/_common.py b/test/_common.py index 7341bc1a1..b222566b7 100644 --- a/test/_common.py +++ b/test/_common.py @@ -16,7 +16,6 @@ import time import sys import os -from beets import logging import tempfile import shutil from contextlib import contextmanager @@ -30,7 +29,7 @@ except ImportError: # Mangle the search path to include the beets sources. sys.path.insert(0, '..') import beets.library -from beets import importer +from beets import importer, logging from beets.ui import commands import beets diff --git a/test/helper.py b/test/helper.py index fdbe9f9bf..4dafb4c39 100644 --- a/test/helper.py +++ b/test/helper.py @@ -35,13 +35,13 @@ import os import os.path import shutil import subprocess -from beets import logging from tempfile import mkdtemp, mkstemp from contextlib import contextmanager from StringIO import StringIO from enum import Enum import beets +from beets import logging from beets import config import beets.plugins from beets.library import Library, Item, Album