Undo from _common import unittest indirection

This was a vestige from when we used to need the unittest2 library for pre-2.7
compatibility. Now that we require Python 2.7, we aren't using that library
and this indirection wasn't doing any good.

test/test_acousticbrainz.py

@@ -20,8 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import json
 import os.path
+import unittest
 
-from test._common import unittest, RSRC
+from test._common import RSRC
 
 from beetsplug.acousticbrainz import AcousticPlugin, ABSCHEME
 

test/test_art.py

@@ -19,12 +19,12 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 
 import responses
 from mock import patch
 
 from test import _common
-from test._common import unittest
 from beetsplug import fetchart
 from beets.autotag import AlbumInfo, AlbumMatch
 from beets import config

test/test_autotag.py

@@ -19,9 +19,9 @@ from __future__ import division, absolute_import, print_function
 
 import re
 import copy
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets import autotag
 from beets.autotag import match
 from beets.autotag.hooks import Distance, string_dist

test/test_bucket.py

@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beetsplug import bucket
 from beets import config, ui
 

test/test_config_command.py

@@ -7,11 +7,11 @@ import yaml
 from mock import patch
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
 from beets import ui
 from beets import config
 
-from test._common import unittest
 from test.helper import TestHelper
 from beets.library import Library
 import six

test/test_convert.py

@@ -17,8 +17,9 @@ from __future__ import division, absolute_import, print_function
 
 import re
 import os.path
+import unittest
+
 from test import _common
-from test._common import unittest
 from test import helper
 from test.helper import control_stdin, capture_log
 

test/test_datequery.py

@@ -18,8 +18,8 @@
 from __future__ import division, absolute_import, print_function
 
 from test import _common
-from test._common import unittest
 from datetime import datetime
+import unittest
 import time
 from beets.dbcore.query import _parse_periods, DateInterval, DateQuery
 

test/test_dbcore.py

@@ -20,10 +20,10 @@ from __future__ import division, absolute_import, print_function
 import os
 import shutil
 import sqlite3
+import unittest
 from six import assertRaisesRegex
 
 from test import _common
-from test._common import unittest
 from beets import dbcore
 from tempfile import mkstemp
 import six

test/test_discogs.py

@@ -17,8 +17,9 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest, Bag
+from test._common import Bag
 
 from beetsplug.discogs import DiscogsPlugin
 

test/test_edit.py

@@ -15,10 +15,10 @@
 
 from __future__ import division, absolute_import, print_function
 import codecs
+import unittest
 
 from mock import patch
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper, control_stdin
 from test.test_ui_importer import TerminalImportSessionSetup
 from test.test_importer import ImportHelper, AutotagStub

test/test_embedart.py

@@ -19,9 +19,9 @@ import os.path
 import shutil
 from mock import patch, MagicMock
 import tempfile
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.mediafile import MediaFile

test/test_embyupdate.py

@@ -2,9 +2,9 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
 from test.helper import TestHelper
 from beetsplug import embyupdate
+import unittest
 import responses
 
 

test/test_fetchart.py

@@ -16,7 +16,7 @@
 from __future__ import division, absolute_import, print_function
 
 import os
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 from beets import util
 

test/test_filefilter.py

@@ -20,9 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+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

test/test_files.py

@@ -21,9 +21,9 @@ import shutil
 import os
 import stat
 from os.path import join
+import unittest
 
 from test import _common
-from test._common import unittest
 from test._common import item, touch
 import beets.library
 from beets import util

test/test_ftintitle.py

@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 from beetsplug import ftintitle
 

test/test_hidden.py

@@ -17,7 +17,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 import sys
 import tempfile
 from beets.util import hidden

test/test_hook.py

@@ -17,9 +17,9 @@ from __future__ import division, absolute_import, print_function
 
 import os.path
 import tempfile
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets import config

test/test_ihate.py

@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beets import importer
 from beets.library import Item
 from beetsplug.ihate import IHatePlugin

test/test_importadded.py

@@ -18,8 +18,8 @@ from __future__ import division, absolute_import, print_function
 """Tests for the `importadded` plugin."""
 
 import os
+import unittest
 
-from test._common import unittest
 from test.test_importer import ImportHelper, AutotagStub
 from beets import importer
 from beets import util

test/test_importer.py

@@ -27,9 +27,9 @@ from tempfile import mkstemp
 from zipfile import ZipFile
 from tarfile import TarFile
 from mock import patch, Mock
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets.util import displayable_path, bytestring_path, py3_path
 from test.helper import TestImportSession, TestHelper, has_program, capture_log
 from beets import importer

test/test_importfeeds.py

@@ -6,8 +6,8 @@ import os
 import os.path
 import tempfile
 import shutil
+import unittest
 
-from test._common import unittest
 from beets import config
 from beets.library import Item, Album, Library
 from beetsplug.importfeeds import ImportFeedsPlugin

test/test_info.py

@@ -15,7 +15,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.mediafile import MediaFile

test/test_ipfs.py

@@ -20,11 +20,12 @@ from beets import library
 from beets.util import bytestring_path, _fsencoding
 from beetsplug.ipfs import IPFSPlugin
 
-from test import _common
-from test._common import unittest
-from test.helper import TestHelper
+import unittest
 import os
 
+from test import _common
+from test.helper import TestHelper
+
 
 @patch('beets.util.command_output', Mock())
 class IPFSPluginTest(unittest.TestCase, TestHelper):

test/test_keyfinder.py

@@ -16,7 +16,7 @@
 from __future__ import division, absolute_import, print_function
 
 from mock import patch
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.library import Item

test/test_lastgenre.py

@@ -17,10 +17,10 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import Mock
 
 from test import _common
-from test._common import unittest
 from beetsplug import lastgenre
 from beets import config
 

test/test_library.py

@@ -25,9 +25,9 @@ import re
 import unicodedata
 import sys
 import time
+import unittest
 
 from test import _common
-from test._common import unittest
 from test._common import item
 import beets.library
 import beets.mediafile

test/test_logging.py

@@ -7,12 +7,13 @@ import sys
 import threading
 import logging as log
 from six import StringIO
+import unittest
 
 import beets.logging as blog
 from beets import plugins, ui
 import beetsplug
 from test import _common
-from test._common import unittest, TestCase
+from test._common import TestCase
 from test import helper
 import six
 

test/test_lyrics.py

@@ -18,13 +18,13 @@
 from __future__ import division, absolute_import, print_function
 
 import os
-from test import _common
 import sys
 import re
+import unittest
 
+from test import _common
 from mock import MagicMock
 
-from test._common import unittest
 from beetsplug import lyrics
 from beets.library import Item
 from beets.util import confit, bytestring_path

test/test_mb.py

@@ -18,9 +18,10 @@
 from __future__ import division, absolute_import, print_function
 
 from test import _common
-from test._common import unittest
 from beets.autotag import mb
 from beets import config
+
+import unittest
 import mock
 
 

test/test_mbsubmit.py

@@ -15,7 +15,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import capture_stdout, control_stdin, TestHelper
 from test.test_importer import ImportHelper, AutotagStub
 from test.test_ui_importer import TerminalImportSessionSetup

test/test_mbsync.py

@@ -15,9 +15,9 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import patch
 
-from test._common import unittest
 from test.helper import TestHelper,\
     generate_album_info, \
     generate_track_info, \

test/test_mediafile.py

@@ -23,10 +23,10 @@ import shutil
 import tempfile
 import datetime
 import time
+import unittest
 from six import assertCountEqual
 
 from test import _common
-from test._common import unittest
 from beets.mediafile import MediaFile, Image, \
     ImageType, CoverArtField, UnreadableFileError
 

test/test_mediafile_edge.py

@@ -19,10 +19,10 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 import mutagen.id3
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets import mediafile

test/test_metasync.py

@@ -21,9 +21,9 @@ import time
 from datetime import datetime
 from beets.library import Item
 from beets.util import py3_path
+import unittest
 
 from test import _common
-from test._common import unittest
 from test.helper import TestHelper
 
 

test/test_mpdstats.py

@@ -15,8 +15,8 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from mock import Mock, patch, call, ANY
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.library import Item

test/test_permissions.py

@@ -6,9 +6,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import platform
+import unittest
 from mock import patch, Mock
 
-from test._common import unittest
 from test.helper import TestHelper
 from beets.util import displayable_path
 from beetsplug.permissions import (check_permissions,

test/test_pipeline.py

@@ -18,8 +18,8 @@
 from __future__ import division, absolute_import, print_function
 
 import six
+import unittest
 
-from test._common import unittest
 from beets.util import pipeline
 
 

test/test_play.py

@@ -19,9 +19,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 
+import unittest
 from mock import patch, ANY
 
-from test._common import unittest
 from test.helper import TestHelper, control_stdin
 
 from beets.ui import UserError

test/test_player.py

@@ -17,7 +17,7 @@
 """
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from beetsplug import bpd
 
 

test/test_plexupdate.py

@@ -2,9 +2,9 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
 from test.helper import TestHelper
 from beetsplug.plexupdate import get_music_section, update_plex
+import unittest
 import responses
 
 

test/test_plugins.py

@@ -19,6 +19,7 @@ import os
 from mock import patch, Mock, ANY
 import shutil
 import itertools
+import unittest
 
 from beets.importer import SingletonImportTask, SentinelImportTask, \
     ArchiveImportTask, action
@@ -30,7 +31,7 @@ from beets.util import displayable_path, bytestring_path
 
 from test.test_importer import ImportHelper, AutotagStub
 from test.test_ui_importer import TerminalImportSessionSetup
-from test._common import unittest, RSRC
+from test._common import RSRC
 from test import helper
 
 

test/test_query.py

@@ -21,9 +21,9 @@ from functools import partial
 from mock import patch
 import os
 import sys
+import unittest
 
 from test import _common
-from test._common import unittest
 from test import helper
 
 import beets.library

test/test_replaygain.py

@@ -16,14 +16,15 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
+import six
+
 from test.helper import TestHelper, has_program
 
 from beets import config
 from beets.mediafile import MediaFile
 from beetsplug.replaygain import (FatalGstreamerPluginReplayGainError,
                                   GStreamerBackend)
-import six
 
 try:
     import gi

test/test_smartplaylist.py

@@ -18,6 +18,7 @@ from __future__ import division, absolute_import, print_function
 from os import path, remove
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
 from mock import Mock, MagicMock
 
@@ -29,7 +30,6 @@ from beets.util import syspath, bytestring_path, py3_path, CHAR_REPLACE
 from beets.ui import UserError
 from beets import config
 
-from test._common import unittest
 from test.helper import TestHelper
 
 

test/test_sort.py

@@ -17,8 +17,8 @@
 """
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 import beets.library
 from beets import dbcore
 from beets import config

test/test_spotify.py

@@ -6,9 +6,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import responses
+import unittest
 
 from test import _common
-from test._common import unittest
 from beets import config
 from beets.library import Item
 from beetsplug import spotify

test/test_template.py

@@ -17,9 +17,9 @@
 """
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
-from beets.util import functemplate
+import unittest
 import six
+from beets.util import functemplate
 
 
 def _normexpr(expr):

test/test_the.py

@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test import _common
 from beets import config
 from beetsplug.the import ThePlugin, PATTERN_A, PATTERN_THE, FORMAT

test/test_thumbnails.py

@@ -19,8 +19,8 @@ import os.path
 from mock import Mock, patch, call
 from tempfile import mkdtemp
 from shutil import rmtree
+import unittest
 
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.util import bytestring_path

test/test_types_plugin.py

@@ -17,8 +17,8 @@ from __future__ import division, absolute_import, print_function
 
 import time
 from datetime import datetime
+import unittest
 
-from test._common import unittest
 from test.helper import TestHelper
 
 from beets.util.confit import ConfigValueError

test/test_ui.py

@@ -24,10 +24,10 @@ import subprocess
 import platform
 from copy import deepcopy
 import six
+import unittest
 
 from mock import patch, Mock
 from test import _common
-from test._common import unittest
 from test.helper import capture_stdout, has_program, TestHelper, control_stdin
 
 from beets import library

test/test_ui_commands.py

@@ -20,9 +20,9 @@ from __future__ import division, absolute_import, print_function
 
 import os
 import shutil
+import unittest
 
 from test import _common
-from test._common import unittest
 
 from beets import library
 from beets import ui

test/test_ui_importer.py

@@ -20,8 +20,9 @@ test_importer module. But here the test importer inherits from
 """
 
 from __future__ import division, absolute_import, print_function
+import unittest
 
-from test._common import unittest, DummyIO
+from test._common import DummyIO
 from test import test_importer
 from beets.ui.commands import TerminalImportSession
 from beets import importer

test/test_ui_init.py

@@ -18,8 +18,8 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 
 from beets import ui
 

test/test_util.py

@@ -20,10 +20,10 @@ import sys
 import re
 import os
 import subprocess
+import unittest
 
 from mock import patch, Mock
 
-from test._common import unittest
 from test import _common
 from beets import util
 import six

test/test_vfs.py

@@ -16,8 +16,8 @@
 """Tests for the virtual filesystem builder.."""
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from test import _common
-from test._common import unittest
 from beets import library
 from beets import vfs
 

test/test_web.py

@@ -4,9 +4,9 @@
 
 from __future__ import division, absolute_import, print_function
 
+import unittest
 from six import assertCountEqual
 
-from test._common import unittest
 from test import _common
 import json
 from beets.library import Item, Album

test/test_zero.py

@@ -4,7 +4,7 @@
 
 from __future__ import division, absolute_import, print_function
 
-from test._common import unittest
+import unittest
 from test.helper import TestHelper
 
 from beets.library import Item

test/testall.py

@@ -20,8 +20,7 @@ from __future__ import division, absolute_import, print_function
 import os
 import re
 import sys
-
-from test._common import unittest
+import unittest
 
 pkgpath = os.path.dirname(__file__) or '.'
 sys.path.append(pkgpath)