Merge pull request #4030 from arogl/pyupgrade

pyupgrade of beets to Python 3.6
beetbox · Sep 28, 2021 · 018396c · 018396c
2 parents 7ae8b9c + 237bd07
commit 018396c
Show file tree

Hide file tree

Showing 182 changed files with 4,880 additions and 5,395 deletions.
diff --git a/beet b/beet
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 
 # This file is part of beets.
 # Copyright 2016, Adrian Sampson.
@@ -15,7 +14,6 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
-from __future__ import division, absolute_import, print_function
 
 import beets.ui
 

diff --git a/beets/__init__.py b/beets/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of beets.
 # Copyright 2016, Adrian Sampson.
 #
@@ -13,21 +12,20 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
-from __future__ import division, absolute_import, print_function
 
 import confuse
 from sys import stderr
 
-__version__ = u'1.5.1'
-__author__ = u'Adrian Sampson <adrian@radbox.org>'
+__version__ = '1.5.1'
+__author__ = 'Adrian Sampson <adrian@radbox.org>'
 
 
 class IncludeLazyConfig(confuse.LazyConfig):
     """A version of Confuse's LazyConfig that also merges in data from
     YAML files specified in an `include` setting.
     """
     def read(self, user=True, defaults=True):
-        super(IncludeLazyConfig, self).read(user, defaults)
+        super().read(user, defaults)
 
         try:
             for view in self['include']:

diff --git a/beets/__main__.py b/beets/__main__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of beets.
 # Copyright 2017, Adrian Sampson.
 #
@@ -17,7 +16,6 @@
 `python -m beets`.
 """
 
-from __future__ import division, absolute_import, print_function
 
 import sys
 from .ui import main

diff --git a/beets/art.py b/beets/art.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of beets.
 # Copyright 2016, Adrian Sampson.
 #
@@ -17,7 +16,6 @@
 music and items' embedded album art.
 """
 
-from __future__ import division, absolute_import, print_function
 
 import subprocess
 import platform
@@ -43,7 +41,7 @@ def get_art(log, item):
     try:
         mf = mediafile.MediaFile(syspath(item.path))
     except mediafile.UnreadableFileError as exc:
-        log.warning(u'Could not extract art from {0}: {1}',
+        log.warning('Could not extract art from {0}: {1}',
                     displayable_path(item.path), exc)
         return
 
@@ -58,20 +56,20 @@ def embed_item(log, item, imagepath, maxwidth=None, itempath=None,
     # Conditions and filters.
     if compare_threshold:
         if not check_art_similarity(log, item, imagepath, compare_threshold):
-            log.info(u'Image not similar; skipping.')
+            log.info('Image not similar; skipping.')
             return
     if ifempty and get_art(log, item):
-        log.info(u'media file already contained art')
+        log.info('media file already contained art')
         return
     if maxwidth and not as_album:
         imagepath = resize_image(log, imagepath, maxwidth, quality)
 
     # Get the `Image` object from the file.
     try:
-        log.debug(u'embedding {0}', displayable_path(imagepath))
+        log.debug('embedding {0}', displayable_path(imagepath))
         image = mediafile_image(imagepath, maxwidth)
-    except IOError as exc:
-        log.warning(u'could not read image file: {0}', exc)
+    except OSError as exc:
+        log.warning('could not read image file: {0}', exc)
         return
 
     # Make sure the image kind is safe (some formats only support PNG
@@ -90,16 +88,16 @@ def embed_album(log, album, maxwidth=None, quiet=False, compare_threshold=0,
     """
     imagepath = album.artpath
     if not imagepath:
-        log.info(u'No album art present for {0}', album)
+        log.info('No album art present for {0}', album)
         return
     if not os.path.isfile(syspath(imagepath)):
-        log.info(u'Album art not found at {0} for {1}',
+        log.info('Album art not found at {0} for {1}',
                  displayable_path(imagepath), album)
         return
     if maxwidth:
         imagepath = resize_image(log, imagepath, maxwidth, quality)
 
-    log.info(u'Embedding album art into {0}', album)
+    log.info('Embedding album art into {0}', album)
 
     for item in album.items():
         embed_item(log, item, imagepath, maxwidth, None, compare_threshold,
@@ -110,7 +108,7 @@ def resize_image(log, imagepath, maxwidth, quality):
     """Returns path to an image resized to maxwidth and encoded with the
     specified quality level.
     """
-    log.debug(u'Resizing album art to {0} pixels wide and encoding at quality \
+    log.debug('Resizing album art to {0} pixels wide and encoding at quality \
               level {1}', maxwidth, quality)
     imagepath = ArtResizer.shared.resize(maxwidth, syspath(imagepath),
                                          quality=quality)
@@ -135,7 +133,7 @@ def check_art_similarity(log, item, imagepath, compare_threshold):
                            syspath(art, prefix=False),
                            '-colorspace', 'gray', 'MIFF:-']
             compare_cmd = ['compare', '-metric', 'PHASH', '-', 'null:']
-            log.debug(u'comparing images with pipeline {} | {}',
+            log.debug('comparing images with pipeline {} | {}',
                       convert_cmd, compare_cmd)
             convert_proc = subprocess.Popen(
                 convert_cmd,
@@ -159,7 +157,7 @@ def check_art_similarity(log, item, imagepath, compare_threshold):
             convert_proc.wait()
             if convert_proc.returncode:
                 log.debug(
-                    u'ImageMagick convert failed with status {}: {!r}',
+                    'ImageMagick convert failed with status {}: {!r}',
                     convert_proc.returncode,
                     convert_stderr,
                 )
@@ -169,7 +167,7 @@ def check_art_similarity(log, item, imagepath, compare_threshold):
             stdout, stderr = compare_proc.communicate()
             if compare_proc.returncode:
                 if compare_proc.returncode != 1:
-                    log.debug(u'ImageMagick compare failed: {0}, {1}',
+                    log.debug('ImageMagick compare failed: {0}, {1}',
                               displayable_path(imagepath),
                               displayable_path(art))
                     return
@@ -180,10 +178,10 @@ def check_art_similarity(log, item, imagepath, compare_threshold):
             try:
                 phash_diff = float(out_str)
             except ValueError:
-                log.debug(u'IM output is not a number: {0!r}', out_str)
+                log.debug('IM output is not a number: {0!r}', out_str)
                 return
 
-            log.debug(u'ImageMagick compare score: {0}', phash_diff)
+            log.debug('ImageMagick compare score: {0}', phash_diff)
             return phash_diff <= compare_threshold
 
     return True
@@ -193,18 +191,18 @@ def extract(log, outpath, item):
     art = get_art(log, item)
     outpath = bytestring_path(outpath)
     if not art:
-        log.info(u'No album art present in {0}, skipping.', item)
+        log.info('No album art present in {0}, skipping.', item)
         return
 
     # Add an extension to the filename.
     ext = mediafile.image_extension(art)
     if not ext:
-        log.warning(u'Unknown image type in {0}.',
+        log.warning('Unknown image type in {0}.',
                     displayable_path(item.path))
         return
     outpath += bytestring_path('.' + ext)
 
-    log.info(u'Extracting album art from: {0} to: {1}',
+    log.info('Extracting album art from: {0} to: {1}',
              item, displayable_path(outpath))
     with open(syspath(outpath), 'wb') as f:
         f.write(art)
@@ -220,7 +218,7 @@ def extract_first(log, outpath, items):
 
 def clear(log, lib, query):
     items = lib.items(query)
-    log.info(u'Clearing album art from {0} items', len(items))
+    log.info('Clearing album art from {0} items', len(items))
     for item in items:
-        log.debug(u'Clearing art for {0}', item)
+        log.debug('Clearing art for {0}', item)
         item.try_write(tags={'images': None})
diff --git a/beets/autotag/__init__.py b/beets/autotag/__init__.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # This file is part of beets.
 # Copyright 2016, Adrian Sampson.
 #
@@ -16,7 +15,6 @@
 """Facilities for automatically determining files' correct metadata.
 """
 
-from __future__ import division, absolute_import, print_function
 
 from beets import logging
 from beets import config