Move "from beets import logging" statements

Move the import next to other beets-related imports

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.

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

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

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

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

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

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
 
 

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'

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

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'

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
 

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
 

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

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')

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')

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'

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

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

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

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

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

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

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')
 

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')
 

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

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')

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

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')
 

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

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

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')

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
 

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}$'

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

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

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

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
 

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

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
 

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

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')

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
 

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