Revert "Do __name__ comparison with bytes and not unicode"

This reverts commit 9c41c39913.
That commit used byte strings for the `if __name__ == '__main__'` pattern,
which was necessary when we were doing unicode_literals. But it is wrong on
Python 3, and now that we're liberated from unicode_literals, we need to go
back to native strings for this comparison.

beets/util/confit.py

@@ -538,7 +538,7 @@ def _package_path(name):
     ``name == "__main__"``).
     """
     loader = pkgutil.get_loader(name)
-    if loader is None or name == b'__main__':
+    if loader is None or name == '__main__':
         return None
 
     if hasattr(loader, 'get_filename'):

beets/util/functemplate.py

@@ -559,7 +559,7 @@ class Template(object):
 
 # Performance tests.
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     import timeit
     _tmpl = Template(u'foo $bar %baz{foozle $bar barzle} $bar')
     _vars = {'bar': 'qux'}

beets/util/pipeline.py

@@ -459,7 +459,7 @@ class Pipeline(object):
                 yield msg
 
 # Smoke test.
-if __name__ == b'__main__':
+if __name__ == '__main__':
     import time
 
     # Test a normally-terminating pipeline both in sequence and

beetsplug/bpd/gstplayer.py

@@ -214,7 +214,7 @@ def play_complicated(paths):
     while my_paths:
         time.sleep(1)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     # A very simple command-line player. Just give it names of audio
     # files on the command line; these are all played in sequence.
     paths = [os.path.abspath(os.path.expanduser(p))

test/lyrics_download_samples.py

@@ -54,5 +54,5 @@ def main(argv=None):
             with safe_open_w(fn) as f:
                 f.write(html.encode('utf8'))
 
-if __name__ == b'__main__':
+if __name__ == "__main__":
     sys.exit(main())

test/test_art.py

@@ -631,5 +631,5 @@ class EnforceRatioConfigTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_autotag.py

@@ -952,5 +952,5 @@ class EnumTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_bucket.py

@@ -164,5 +164,5 @@ class BucketPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_config_command.py

@@ -134,5 +134,5 @@ class ConfigCommandTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_convert.py

@@ -237,5 +237,5 @@ class NeverConvertLossyFilesTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_datequery.py

@@ -127,5 +127,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_dbcore.py

@@ -658,5 +658,5 @@ class ResultsIteratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_echonest.py

@@ -189,5 +189,5 @@ class EchonestCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_embedart.py

@@ -200,5 +200,5 @@ class ArtSimilarityTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_fetchart.py

@@ -54,5 +54,5 @@ class FetchartCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_files.py

@@ -627,5 +627,5 @@ class MkDirAllTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_ftintitle.py

@@ -181,5 +181,5 @@ class FtInTitlePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_ihate.py

@@ -50,5 +50,5 @@ class IHatePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_importadded.py

@@ -171,5 +171,5 @@ class ImportAddedTest(unittest.TestCase, ImportHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_importer.py

@@ -1854,5 +1854,5 @@ def mocked_get_recording_by_id(id_, includes=[], release_status=[],
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_importfeeds.py

@@ -61,5 +61,5 @@ class ImportfeedsTestTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_info.py

@@ -116,5 +116,5 @@ class InfoTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_keyfinder.py

@@ -81,5 +81,5 @@ class KeyFinderTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_lastgenre.py

@@ -216,5 +216,5 @@ class LastGenrePluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_library.py

@@ -1223,5 +1223,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_logging.py

@@ -296,5 +296,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_lyrics.py

@@ -390,5 +390,5 @@ class LyricsGooglePluginTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_mb.py

@@ -491,5 +491,5 @@ class MBLibraryTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_mbsync.py

@@ -131,5 +131,5 @@ class MbsyncCliTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_mediafile.py

@@ -956,5 +956,5 @@ class MediaFieldTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_mediafile_edge.py

@@ -399,5 +399,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_permissions.py

@@ -73,5 +73,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_pipeline.py

@@ -240,5 +240,5 @@ class StageDecoratorTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_player.py

@@ -66,5 +66,5 @@ class CommandParseTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_plexupdate.py

@@ -124,5 +124,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_plugins.py

@@ -559,5 +559,5 @@ class PromptChoicesTest(TerminalImportSessionSetup, unittest.TestCase,
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_query.py

@@ -979,5 +979,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_replaygain.py

@@ -167,5 +167,5 @@ class ReplayGainLdnsCliTest(ReplayGainCliTestBase, unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_sort.py

@@ -536,5 +536,5 @@ def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_spotify.py

@@ -208,5 +208,5 @@ class SpotifyPluginTest(_common.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_template.py

@@ -276,5 +276,5 @@ class EvalTest(unittest.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_the.py

@@ -64,5 +64,5 @@ class ThePluginTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_types_plugin.py

@@ -151,5 +151,5 @@ def mktime(*args):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_ui.py

@@ -1299,5 +1299,5 @@ class CommonOptionsParserTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_ui_importer.py

@@ -148,5 +148,5 @@ class GlobalGroupAlbumsImportTest(TerminalImportSessionSetup,
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_vfs.py

@@ -45,5 +45,5 @@ class VFSTest(_common.TestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_web.py

@@ -109,5 +109,5 @@ class WebPluginTest(_common.LibTestCase):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/test_zero.py

@@ -124,5 +124,5 @@ class ZeroPluginTest(unittest.TestCase, TestHelper):
 def suite():
     return unittest.TestLoader().loadTestsFromName(__name__)
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')

test/testall.py

@@ -46,5 +46,5 @@ def suite():
             s.addTest(__import__(modname).suite())
     return s
 
-if __name__ == b'__main__':
+if __name__ == '__main__':
     unittest.main(defaultTest='suite')