From 7df8bef8b7201395886a23eaf925b46090763655 Mon Sep 17 00:00:00 2001
From: Bruno Cauet <brunocauet@gmail.com>
Date: Sun, 4 Jan 2015 16:19:54 +0100
Subject: [PATCH] =?UTF-8?q?Update=20logging=20imports:=20logging=20?=
 =?UTF-8?q?=E2=86=92=20beets.logging?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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                | 2 +-
 beets/mediafile.py              | 2 +-
 beets/plugins.py                | 2 +-
 beets/ui/__init__.py            | 2 +-
 beets/ui/commands.py            | 2 +-
 beets/util/artresizer.py        | 2 +-
 beetsplug/beatport.py           | 2 +-
 beetsplug/bpd/__init__.py       | 2 +-
 beetsplug/bpm.py                | 2 +-
 beetsplug/bucket.py             | 2 +-
 beetsplug/chroma.py             | 2 +-
 beetsplug/convert.py            | 2 +-
 beetsplug/discogs.py            | 2 +-
 beetsplug/duplicates.py         | 2 +-
 beetsplug/echonest.py           | 2 +-
 beetsplug/embedart.py           | 2 +-
 beetsplug/fetchart.py           | 2 +-
 beetsplug/freedesktop.py        | 2 +-
 beetsplug/ftintitle.py          | 2 +-
 beetsplug/ihate.py              | 2 +-
 beetsplug/importadded.py        | 2 +-
 beetsplug/importfeeds.py        | 2 +-
 beetsplug/info.py               | 2 +-
 beetsplug/inline.py             | 2 +-
 beetsplug/keyfinder.py          | 2 +-
 beetsplug/lastgenre/__init__.py | 2 +-
 beetsplug/lastimport.py         | 2 +-
 beetsplug/lyrics.py             | 2 +-
 beetsplug/mbcollection.py       | 2 +-
 beetsplug/mbsync.py             | 2 +-
 beetsplug/missing.py            | 2 +-
 beetsplug/mpdstats.py           | 2 +-
 beetsplug/play.py               | 2 +-
 beetsplug/replaygain.py         | 2 +-
 beetsplug/rewrite.py            | 2 +-
 beetsplug/scrub.py              | 2 +-
 beetsplug/spotify.py            | 2 +-
 beetsplug/the.py                | 2 +-
 beetsplug/zero.py               | 2 +-
 test/_common.py                 | 2 +-
 test/helper.py                  | 2 +-
 46 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/beets/autotag/__init__.py b/beets/autotag/__init__.py
index 5ac2380db..cf7048008 100644
--- a/beets/autotag/__init__.py
+++ b/beets/autotag/__init__.py
@@ -14,7 +14,7 @@
 
 """Facilities for automatically determining files' correct metadata.
 """
-import logging
+from beets import logging
 
 from beets import config
 
diff --git a/beets/autotag/hooks.py b/beets/autotag/hooks.py
index beb3bd91b..43433a2cd 100644
--- a/beets/autotag/hooks.py
+++ b/beets/autotag/hooks.py
@@ -13,7 +13,7 @@
 # included in all copies or substantial portions of the Software.
 
 """Glue between metadata sources and the matching logic."""
-import logging
+from beets import logging
 from collections import namedtuple
 import re
 
diff --git a/beets/autotag/match.py b/beets/autotag/match.py
index 00556359f..39a788c74 100644
--- a/beets/autotag/match.py
+++ b/beets/autotag/match.py
@@ -18,7 +18,7 @@ releases and tracks.
 from __future__ import division
 
 import datetime
-import logging
+from beets import logging
 import re
 from munkres import Munkres
 
diff --git a/beets/autotag/mb.py b/beets/autotag/mb.py
index 72662bd5c..e0f6088f6 100644
--- a/beets/autotag/mb.py
+++ b/beets/autotag/mb.py
@@ -14,7 +14,7 @@
 
 """Searches for albums in the MusicBrainz database.
 """
-import logging
+from beets import logging
 import musicbrainzngs
 import re
 import traceback
diff --git a/beets/importer.py b/beets/importer.py
index 4aa39ff92..f3b8975c5 100644
--- a/beets/importer.py
+++ b/beets/importer.py
@@ -19,7 +19,7 @@ from __future__ import print_function
 
 import os
 import re
-import logging
+from beets import logging
 import pickle
 import itertools
 from collections import defaultdict
diff --git a/beets/library.py b/beets/library.py
index a4213d8b3..d205e009b 100644
--- a/beets/library.py
+++ b/beets/library.py
@@ -16,7 +16,7 @@
 """
 import os
 import sys
-import logging
+from beets import logging
 import shlex
 import unicodedata
 import time
diff --git a/beets/mediafile.py b/beets/mediafile.py
index 9106bbd71..1bee05e5e 100644
--- a/beets/mediafile.py
+++ b/beets/mediafile.py
@@ -48,7 +48,7 @@ import math
 import struct
 import imghdr
 import os
-import logging
+from beets import logging
 import traceback
 import enum
 
diff --git a/beets/plugins.py b/beets/plugins.py
index c3058b617..917baf8a1 100755
--- a/beets/plugins.py
+++ b/beets/plugins.py
@@ -14,7 +14,7 @@
 
 """Support for beets plugins."""
 
-import logging
+from beets import logging
 import traceback
 import inspect
 import re
diff --git a/beets/ui/__init__.py b/beets/ui/__init__.py
index 4617e84fc..09dec6a78 100644
--- a/beets/ui/__init__.py
+++ b/beets/ui/__init__.py
@@ -23,7 +23,7 @@ import optparse
 import textwrap
 import sys
 from difflib import SequenceMatcher
-import logging
+from beets import logging
 import sqlite3
 import errno
 import re
diff --git a/beets/ui/commands.py b/beets/ui/commands.py
index e55d41504..14b0a6afd 100644
--- a/beets/ui/commands.py
+++ b/beets/ui/commands.py
@@ -17,7 +17,7 @@ interface.
 """
 from __future__ import print_function
 
-import logging
+from beets import logging
 import os
 import time
 import codecs
diff --git a/beets/util/artresizer.py b/beets/util/artresizer.py
index 0145124c1..3bac1539f 100644
--- a/beets/util/artresizer.py
+++ b/beets/util/artresizer.py
@@ -20,7 +20,7 @@ import subprocess
 import os
 import re
 from tempfile import NamedTemporaryFile
-import logging
+from beets import logging
 from beets import util
 
 # Resizing methods
diff --git a/beetsplug/beatport.py b/beetsplug/beatport.py
index 8afefbefb..c431841cf 100644
--- a/beetsplug/beatport.py
+++ b/beetsplug/beatport.py
@@ -14,7 +14,7 @@
 
 """Adds Beatport release and track search support to the autotagger
 """
-import logging
+from beets import logging
 import re
 from datetime import datetime, timedelta
 
diff --git a/beetsplug/bpd/__init__.py b/beetsplug/bpd/__init__.py
index 7b550487c..e654fa6fd 100644
--- a/beetsplug/bpd/__init__.py
+++ b/beetsplug/bpd/__init__.py
@@ -21,7 +21,7 @@ from __future__ import print_function
 import re
 from string import Template
 import traceback
-import logging
+from beets import logging
 import random
 import time
 
diff --git a/beetsplug/bpm.py b/beetsplug/bpm.py
index 2189e2fae..d5d324bf7 100644
--- a/beetsplug/bpm.py
+++ b/beetsplug/bpm.py
@@ -15,7 +15,7 @@
 """Determine BPM by pressing a key to the rhythm."""
 
 import time
-import logging
+from beets import logging
 
 from beets import ui
 from beets.plugins import BeetsPlugin
diff --git a/beetsplug/bucket.py b/beetsplug/bucket.py
index 64dcdf6ee..86ec6be6c 100644
--- a/beetsplug/bucket.py
+++ b/beetsplug/bucket.py
@@ -16,7 +16,7 @@
 """
 
 from datetime import datetime
-import logging
+from beets import logging
 import re
 import string
 from itertools import tee, izip
diff --git a/beetsplug/chroma.py b/beetsplug/chroma.py
index 0ff86e220..a339b68a6 100644
--- a/beetsplug/chroma.py
+++ b/beetsplug/chroma.py
@@ -22,7 +22,7 @@ from beets import config
 from beets.util import confit
 from beets.autotag import hooks
 import acoustid
-import logging
+from beets import logging
 from collections import defaultdict
 
 API_KEY = '1vOwZtEn'
diff --git a/beetsplug/convert.py b/beetsplug/convert.py
index 679ebcd72..cd07dfb22 100644
--- a/beetsplug/convert.py
+++ b/beetsplug/convert.py
@@ -14,7 +14,7 @@
 
 """Converts tracks or albums to external directory
 """
-import logging
+from beets import logging
 import os
 import threading
 import subprocess
diff --git a/beetsplug/discogs.py b/beetsplug/discogs.py
index 41c088225..17c1b05f9 100644
--- a/beetsplug/discogs.py
+++ b/beetsplug/discogs.py
@@ -22,7 +22,7 @@ from discogs_client import Release, Client
 from discogs_client.exceptions import DiscogsAPIError
 from requests.exceptions import ConnectionError
 import beets
-import logging
+from beets import logging
 import re
 import time
 import json
diff --git a/beetsplug/duplicates.py b/beetsplug/duplicates.py
index 4b15bf939..adbbbcf98 100644
--- a/beetsplug/duplicates.py
+++ b/beetsplug/duplicates.py
@@ -15,7 +15,7 @@
 """List duplicate tracks or albums.
 """
 import shlex
-import logging
+from beets import logging
 
 from beets.plugins import BeetsPlugin
 from beets.ui import decargs, print_obj, vararg_callback, Subcommand, UserError
diff --git a/beetsplug/echonest.py b/beetsplug/echonest.py
index 16ba6f3bd..7ebe2c0c3 100644
--- a/beetsplug/echonest.py
+++ b/beetsplug/echonest.py
@@ -15,7 +15,7 @@
 """Fetch a variety of acoustic metrics from The Echo Nest.
 """
 import time
-import logging
+from beets import logging
 import socket
 import os
 import tempfile
diff --git a/beetsplug/embedart.py b/beetsplug/embedart.py
index 3fdfd9055..72e8b17fc 100644
--- a/beetsplug/embedart.py
+++ b/beetsplug/embedart.py
@@ -14,7 +14,7 @@
 
 """Allows beets to embed album art into file metadata."""
 import os.path
-import logging
+from beets import logging
 import imghdr
 import subprocess
 import platform
diff --git a/beetsplug/fetchart.py b/beetsplug/fetchart.py
index e8c11b2f9..dfd4c9017 100644
--- a/beetsplug/fetchart.py
+++ b/beetsplug/fetchart.py
@@ -15,7 +15,7 @@
 """Fetches album art.
 """
 from contextlib import closing
-import logging
+from beets import logging
 import os
 import re
 from tempfile import NamedTemporaryFile
diff --git a/beetsplug/freedesktop.py b/beetsplug/freedesktop.py
index 0aea97c38..303394d34 100644
--- a/beetsplug/freedesktop.py
+++ b/beetsplug/freedesktop.py
@@ -20,7 +20,7 @@ from beets.ui import Subcommand
 from beets.ui import decargs
 
 import os
-import logging
+from beets import logging
 
 log = logging.getLogger('beets.freedesktop')
 
diff --git a/beetsplug/ftintitle.py b/beetsplug/ftintitle.py
index 8bd0974fe..c47ae37c1 100644
--- a/beetsplug/ftintitle.py
+++ b/beetsplug/ftintitle.py
@@ -18,7 +18,7 @@ from beets import plugins
 from beets import ui
 from beets.util import displayable_path
 from beets import config
-import logging
+from beets import logging
 import re
 
 log = logging.getLogger('beets')
diff --git a/beetsplug/ihate.py b/beetsplug/ihate.py
index c8c930833..ed7cbd954 100644
--- a/beetsplug/ihate.py
+++ b/beetsplug/ihate.py
@@ -14,7 +14,7 @@
 
 """Warns you about things you hate (or even blocks import)."""
 
-import logging
+from beets import logging
 from beets.plugins import BeetsPlugin
 from beets.importer import action
 from beets.library import parse_query_string
diff --git a/beetsplug/importadded.py b/beetsplug/importadded.py
index 728112690..3bc991750 100644
--- a/beetsplug/importadded.py
+++ b/beetsplug/importadded.py
@@ -6,7 +6,7 @@ Reimported albums and items are skipped.
 
 from __future__ import unicode_literals, absolute_import, print_function
 
-import logging
+from beets import logging
 import os
 
 from beets import config
diff --git a/beetsplug/importfeeds.py b/beetsplug/importfeeds.py
index dd1bf87df..2697d9eca 100644
--- a/beetsplug/importfeeds.py
+++ b/beetsplug/importfeeds.py
@@ -19,7 +19,7 @@ one wants to manually add music to a player by its path.
 import datetime
 import os
 import re
-import logging
+from beets import logging
 
 from beets.plugins import BeetsPlugin
 from beets.util import normpath, syspath, bytestring_path
diff --git a/beetsplug/info.py b/beetsplug/info.py
index f593bef12..24930ab52 100644
--- a/beetsplug/info.py
+++ b/beetsplug/info.py
@@ -16,7 +16,7 @@
 """
 
 import os
-import logging
+from beets import logging
 
 from beets.plugins import BeetsPlugin
 from beets import ui
diff --git a/beetsplug/inline.py b/beetsplug/inline.py
index 0f2e9f1d4..ab886be20 100644
--- a/beetsplug/inline.py
+++ b/beetsplug/inline.py
@@ -14,7 +14,7 @@
 
 """Allows inline path template customization code in the config file.
 """
-import logging
+from beets import logging
 import traceback
 import itertools
 
diff --git a/beetsplug/keyfinder.py b/beetsplug/keyfinder.py
index 499fa5201..3f1398850 100644
--- a/beetsplug/keyfinder.py
+++ b/beetsplug/keyfinder.py
@@ -15,7 +15,7 @@
 """Uses the `KeyFinder` program to add the `initial_key` field.
 """
 
-import logging
+from beets import logging
 import subprocess
 
 from beets import ui
diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py
index c1c1c39ab..497b0899b 100644
--- a/beetsplug/lastgenre/__init__.py
+++ b/beetsplug/lastgenre/__init__.py
@@ -20,7 +20,7 @@ and has been edited to remove some questionable entries.
 The scraper script used is available here:
 https://gist.github.com/1241307
 """
-import logging
+from beets import logging
 import pylast
 import os
 import yaml
diff --git a/beetsplug/lastimport.py b/beetsplug/lastimport.py
index 7a723a36d..138efbe1f 100644
--- a/beetsplug/lastimport.py
+++ b/beetsplug/lastimport.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.
 
-import logging
+from beets import logging
 import requests
 from beets import ui
 from beets import dbcore
diff --git a/beetsplug/lyrics.py b/beetsplug/lyrics.py
index 17bf4c4fc..04e6d38a8 100644
--- a/beetsplug/lyrics.py
+++ b/beetsplug/lyrics.py
@@ -17,7 +17,7 @@
 from __future__ import print_function
 
 import re
-import logging
+from beets import logging
 import requests
 import json
 import unicodedata
diff --git a/beetsplug/mbcollection.py b/beetsplug/mbcollection.py
index 3683c7584..9dd90f4cd 100644
--- a/beetsplug/mbcollection.py
+++ b/beetsplug/mbcollection.py
@@ -21,7 +21,7 @@ from beets import config
 import musicbrainzngs
 
 import re
-import logging
+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 c96d0cf71..24823a229 100644
--- a/beetsplug/mbsync.py
+++ b/beetsplug/mbsync.py
@@ -14,7 +14,7 @@
 
 """Update library's tags using MusicBrainz.
 """
-import logging
+from beets import logging
 
 from beets.plugins import BeetsPlugin
 from beets import autotag, library, ui, util
diff --git a/beetsplug/missing.py b/beetsplug/missing.py
index 439b1d384..78142e167 100644
--- a/beetsplug/missing.py
+++ b/beetsplug/missing.py
@@ -14,7 +14,7 @@
 
 """List missing tracks.
 """
-import logging
+from beets import logging
 
 from beets.autotag import hooks
 from beets.library import Item
diff --git a/beetsplug/mpdstats.py b/beetsplug/mpdstats.py
index 2fddb6a8c..d8596c1a3 100644
--- a/beetsplug/mpdstats.py
+++ b/beetsplug/mpdstats.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.
 
-import logging
+from beets import logging
 import mpd
 import socket
 import select
diff --git a/beetsplug/play.py b/beetsplug/play.py
index 609627d59..1de61261c 100644
--- a/beetsplug/play.py
+++ b/beetsplug/play.py
@@ -21,7 +21,7 @@ from beets import ui
 from beets import util
 from os.path import relpath
 import platform
-import logging
+from beets import logging
 import shlex
 from tempfile import NamedTemporaryFile
 
diff --git a/beetsplug/replaygain.py b/beetsplug/replaygain.py
index d7f8366f5..7d8cc3520 100644
--- a/beetsplug/replaygain.py
+++ b/beetsplug/replaygain.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.
 
-import logging
+from beets import logging
 import subprocess
 import os
 import collections
diff --git a/beetsplug/rewrite.py b/beetsplug/rewrite.py
index cbb9e2a74..6a58ff490 100644
--- a/beetsplug/rewrite.py
+++ b/beetsplug/rewrite.py
@@ -16,7 +16,7 @@
 formats.
 """
 import re
-import logging
+from beets import logging
 from collections import defaultdict
 
 from beets.plugins import BeetsPlugin
diff --git a/beetsplug/scrub.py b/beetsplug/scrub.py
index 0b071a162..a6346a2f2 100644
--- a/beetsplug/scrub.py
+++ b/beetsplug/scrub.py
@@ -15,7 +15,7 @@
 """Cleans extraneous metadata from files' tags via a command or
 automatically whenever tags are written.
 """
-import logging
+from beets import logging
 
 from beets.plugins import BeetsPlugin
 from beets import ui
diff --git a/beetsplug/spotify.py b/beetsplug/spotify.py
index 33b29fd8d..273dd432b 100644
--- a/beetsplug/spotify.py
+++ b/beetsplug/spotify.py
@@ -2,7 +2,7 @@ from __future__ import print_function
 import re
 import webbrowser
 import requests
-import logging
+from beets import logging
 from beets.plugins import BeetsPlugin
 from beets.ui import decargs
 from beets import ui
diff --git a/beetsplug/the.py b/beetsplug/the.py
index fb441c572..d146b3e69 100644
--- a/beetsplug/the.py
+++ b/beetsplug/the.py
@@ -15,7 +15,7 @@
 """Moves patterns in path formats (suitable for moving articles)."""
 
 import re
-import logging
+from beets import logging
 from beets.plugins import BeetsPlugin
 
 __author__ = 'baobab@heresiarch.info'
diff --git a/beetsplug/zero.py b/beetsplug/zero.py
index ae164bef0..a8c62d42c 100644
--- a/beetsplug/zero.py
+++ b/beetsplug/zero.py
@@ -15,7 +15,7 @@
 """ Clears tag fields in media files."""
 
 import re
-import logging
+from beets import logging
 from beets.plugins import BeetsPlugin
 from beets.mediafile import MediaFile
 from beets.importer import action
diff --git a/test/_common.py b/test/_common.py
index 64f2f7247..7341bc1a1 100644
--- a/test/_common.py
+++ b/test/_common.py
@@ -16,7 +16,7 @@
 import time
 import sys
 import os
-import logging
+from beets import logging
 import tempfile
 import shutil
 from contextlib import contextmanager
diff --git a/test/helper.py b/test/helper.py
index 459e643a0..fdbe9f9bf 100644
--- a/test/helper.py
+++ b/test/helper.py
@@ -35,7 +35,7 @@ import os
 import os.path
 import shutil
 import subprocess
-import logging
+from beets import logging
 from tempfile import mkdtemp, mkstemp
 from contextlib import contextmanager
 from StringIO import StringIO