Merge branch 'master' into patch-1

beets/test/helper.py

@@ -675,7 +675,7 @@ class ImportSessionFixture(ImportSession):
     >>> importer.run()
 
     This imports ``/path/to/import`` into `lib`. It skips the first
-    album and imports thesecond one with metadata from the tags. For the
+    album and imports the second one with metadata from the tags. For the
     remaining albums, the metadata from the autotagger will be applied.
     """
 

test/plugins/lyrics_pages.py

@@ -456,16 +456,6 @@ lyrics_pages = [
     LyricsPage.make(
         "https://www.musica.com/letras.asp?letra=59862",
         """
-        Lady Madonna, children at your feet
-        Wonder how you manage to make ends meet
-        Who finds the money when you pay the rent?
-        Did you think that money was heaven sent?
-
-        Friday night arrives without a suitcase
-        Sunday morning creeping like a nun
-        Monday's child has learned to tie his bootlace
-        See how they run
-
         Lady Madonna, baby at your breast
         Wonders how you manage to feed the rest
 

test/plugins/test_importadded.py

@@ -57,7 +57,7 @@ class ImportAddedTest(PluginMixin, ImportTestCase):
             os.path.getmtime(mfile.path) for mfile in self.import_media
         )
         self.matcher = AutotagStub().install()
-        self.matcher.macthin = AutotagStub.GOOD
+        self.matcher.matching = AutotagStub.IDENT
         self.importer = self.setup_importer()
         self.importer.add_choice(importer.action.APPLY)
 

test/test_importer.py

@@ -440,7 +440,7 @@ class ImportTest(ImportTestCase):
         self.prepare_album_for_import(1)
         self.setup_importer()
         self.matcher = AutotagStub().install()
-        self.matcher.macthin = AutotagStub.GOOD
+        self.matcher.matching = AutotagStub.IDENT
 
     def tearDown(self):
         super().tearDown()