Use Black's default string normalization

Author: jodal

docs/conf.py

@@ -21,106 +21,106 @@ def get_version():
     # Get current library version without requiring the library to be
     # installed, like ``pkg_resources.get_distribution(...).version`` requires.
     cp = configparser.ConfigParser()
-    cp.read(os.path.join(os.path.dirname(__file__), '..', 'setup.cfg'))
-    return cp['metadata']['version']
+    cp.read(os.path.join(os.path.dirname(__file__), "..", "setup.cfg"))
+    return cp["metadata"]["version"]
 
 
 # -- Workarounds to have autodoc generate API docs ----------------------------
 
-sys.path.insert(0, os.path.abspath('..'))
+sys.path.insert(0, os.path.abspath(".."))
 
 
 # Mock cffi module
 module = mock.Mock()
 module.ffi = mock.Mock()
 module.ffi.CData = bytes
 module.lib = mock.Mock()
-module.lib.sp_error_message.return_value = b''
-module.lib.sp_error_message.__name__ = str('sp_error_message')
-sys.modules['spotify._spotify'] = module
+module.lib.sp_error_message.return_value = b""
+module.lib.sp_error_message.__name__ = str("sp_error_message")
+sys.modules["spotify._spotify"] = module
 
 
 # Mock pkg_resources module
 module = mock.Mock()
 module.get_distribution.return_value.version = get_version()
-sys.modules['pkg_resources'] = module
+sys.modules["pkg_resources"] = module
 
 
 # Add all libspotify constants to the lib mock
-with open('sp-constants.csv') as fh:
+with open("sp-constants.csv") as fh:
     for line in fh.readlines():
-        key, value = line.split(',', 1)
+        key, value = line.split(",", 1)
         setattr(module.lib, key, value)
 
 
 # Unwrap decorated methods so Sphinx can inspect their signatures
 import spotify  # noqa
 
 for mod_name, mod in vars(spotify).items():
-    if not isinstance(mod, types.ModuleType) or mod_name in ('threading',):
+    if not isinstance(mod, types.ModuleType) or mod_name in ("threading",):
         continue
     for cls in vars(mod).values():
         if not isinstance(cls, type):
             continue
         for method_name, method in vars(cls).items():
-            if hasattr(method, '__wrapped__'):
+            if hasattr(method, "__wrapped__"):
                 setattr(cls, method_name, method.__wrapped__)
 
 
 # -- General configuration ----------------------------------------------------
 
-needs_sphinx = '1.0'
+needs_sphinx = "1.0"
 
 extensions = [
-    'sphinx.ext.autodoc',
-    'sphinx.ext.extlinks',
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.viewcode',
+    "sphinx.ext.autodoc",
+    "sphinx.ext.extlinks",
+    "sphinx.ext.intersphinx",
+    "sphinx.ext.viewcode",
 ]
 
-templates_path = ['_templates']
-source_suffix = '.rst'
-master_doc = 'index'
+templates_path = ["_templates"]
+source_suffix = ".rst"
+master_doc = "index"
 
-project = 'pyspotify'
-copyright = '2013-2019, Stein Magnus Jodal and contributors'
+project = "pyspotify"
+copyright = "2013-2019, Stein Magnus Jodal and contributors"
 
 release = get_version()
-version = '.'.join(release.split('.')[:2])
+version = ".".join(release.split(".")[:2])
 
-exclude_patterns = ['_build']
+exclude_patterns = ["_build"]
 
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
-modindex_common_prefix = ['spotify.']
+modindex_common_prefix = ["spotify."]
 
-autodoc_default_flags = ['members', 'undoc-members', 'inherited-members']
-autodoc_member_order = 'bysource'
+autodoc_default_flags = ["members", "undoc-members", "inherited-members"]
+autodoc_member_order = "bysource"
 
 intersphinx_mapping = {
-    'python': ('http://docs.python.org/3/', None),
-    'pyalsaaudio': ('https://larsimmisch.github.io/pyalsaaudio/', None),
+    "python": ("http://docs.python.org/3/", None),
+    "pyalsaaudio": ("https://larsimmisch.github.io/pyalsaaudio/", None),
 }
 
 
 # -- Options for HTML output --------------------------------------------------
 
 # html_theme = 'default'
-html_static_path = ['_static']
+html_static_path = ["_static"]
 
 html_use_modindex = True
 html_use_index = True
 html_split_index = False
 html_show_sourcelink = True
 
-htmlhelp_basename = 'pyspotify'
+htmlhelp_basename = "pyspotify"
 
 # -- Options for extlink extension --------------------------------------------
 
 extlinks = {
-    'issue': ('https://github.com/jodal/pyspotify/issues/%s', '#'),
-    'ms-issue': (
-        'https://github.com/mopidy/mopidy-spotify/issues/%s',
-        'mopidy-spotify#',
+    "issue": ("https://github.com/jodal/pyspotify/issues/%s", "#"),
+    "ms-issue": (
+        "https://github.com/mopidy/mopidy-spotify/issues/%s",
+        "mopidy-spotify#",
     ),
 }

examples/cover.py

@@ -9,8 +9,8 @@
 while session.connection.state != spotify.ConnectionState.LOGGED_IN:
     session.process_events()
 
-album = session.get_album('spotify:album:4m2880jivSbbyEGAKfITCa').load()
+album = session.get_album("spotify:album:4m2880jivSbbyEGAKfITCa").load()
 cover = album.cover(spotify.ImageSize.LARGE).load()
 
-open('/tmp/cover.jpg', 'wb').write(cover.data)
-open('/tmp/cover.html', 'w').write('<img src="%s">' % cover.data_uri)
+open("/tmp/cover.jpg", "wb").write(cover.data)
+open("/tmp/cover.html", "w").write('<img src="%s">' % cover.data_uri)

examples/play_track.py

@@ -26,7 +26,7 @@
 if sys.argv[1:]:
     track_uri = sys.argv[1]
 else:
-    track_uri = 'spotify:track:6xZtSE6xaBxmRozKA0F6TA'
+    track_uri = "spotify:track:6xZtSE6xaBxmRozKA0F6TA"
 
 # Assuming a spotify_appkey.key in the current dir
 session = spotify.Session()

examples/shell.py

@@ -22,10 +22,10 @@
 
 class Commander(cmd.Cmd):
 
-    doc_header = 'Commands'
-    prompt = 'spotify> '
+    doc_header = "Commands"
+    prompt = "spotify> "
 
-    logger = logging.getLogger('shell.commander')
+    logger = logging.getLogger("shell.commander")
 
     def __init__(self):
         cmd.Cmd.__init__(self)
@@ -44,7 +44,7 @@ def __init__(self):
         try:
             self.audio_driver = spotify.AlsaSink(self.session)
         except ImportError:
-            self.logger.warning('No audio sink found; audio playback unavailable.')
+            self.logger.warning("No audio sink found; audio playback unavailable.")
 
         self.event_loop = spotify.EventLoop(self.session)
         self.event_loop.start()
@@ -62,43 +62,43 @@ def on_end_of_track(self, session):
 
     def precmd(self, line):
         if line:
-            self.logger.debug('New command: %s', line)
+            self.logger.debug("New command: %s", line)
         return line
 
     def emptyline(self):
         pass
 
     def do_debug(self, line):
         "Show more logging output"
-        print('Logging at DEBUG level')
+        print("Logging at DEBUG level")
         logger = logging.getLogger()
         logger.setLevel(logging.DEBUG)
 
     def do_info(self, line):
         "Show normal logging output"
-        print('Logging at INFO level')
+        print("Logging at INFO level")
         logger = logging.getLogger()
         logger.setLevel(logging.INFO)
 
     def do_warning(self, line):
         "Show less logging output"
-        print('Logging at WARNING level')
+        print("Logging at WARNING level")
         logger = logging.getLogger()
         logger.setLevel(logging.WARNING)
 
     def do_EOF(self, line):
         "Exit"
         if self.logged_in.is_set():
-            print('Logging out...')
+            print("Logging out...")
             self.session.logout()
             self.logged_out.wait()
         self.event_loop.stop()
-        print('')
+        print("")
         return True
 
     def do_login(self, line):
         "login <username> <password>"
-        tokens = line.split(' ', 1)
+        tokens = line.split(" ", 1)
         if len(tokens) != 2:
             self.logger.warning("Wrong number of arguments")
             return
@@ -127,60 +127,60 @@ def do_whoami(self, line):
         "whoami"
         if self.logged_in.is_set():
             self.logger.info(
-                'I am %s aka %s. You can find me at %s',
+                "I am %s aka %s. You can find me at %s",
                 self.session.user.canonical_name,
                 self.session.user.display_name,
                 self.session.user.link,
             )
         else:
             self.logger.info(
-                'I am not logged in, but I may be %s',
+                "I am not logged in, but I may be %s",
                 self.session.remembered_user,
             )
 
     def do_play_uri(self, line):
         "play <spotify track uri>"
         if not self.logged_in.is_set():
-            self.logger.warning('You must be logged in to play')
+            self.logger.warning("You must be logged in to play")
             return
         try:
             track = self.session.get_track(line)
             track.load()
         except (ValueError, spotify.Error) as e:
             self.logger.warning(e)
             return
-        self.logger.info('Loading track into player')
+        self.logger.info("Loading track into player")
         self.session.player.load(track)
-        self.logger.info('Playing track')
+        self.logger.info("Playing track")
         self.session.player.play()
 
     def do_pause(self, line):
-        self.logger.info('Pausing track')
+        self.logger.info("Pausing track")
         self.session.player.play(False)
 
     def do_resume(self, line):
-        self.logger.info('Resuming track')
+        self.logger.info("Resuming track")
         self.session.player.play()
 
     def do_stop(self, line):
-        self.logger.info('Stopping track')
+        self.logger.info("Stopping track")
         self.session.player.play(False)
         self.session.player.unload()
 
     def do_seek(self, seconds):
         "seek <seconds>"
         if not self.logged_in.is_set():
-            self.logger.warning('You must be logged in to seek')
+            self.logger.warning("You must be logged in to seek")
             return
         if self.session.player.state is spotify.PlayerState.UNLOADED:
-            self.logger.warning('A track must be loaded before seeking')
+            self.logger.warning("A track must be loaded before seeking")
             return
         self.session.player.seek(int(seconds) * 1000)
 
     def do_search(self, query):
         "search <query>"
         if not self.logged_in.is_set():
-            self.logger.warning('You must be logged in to search')
+            self.logger.warning("You must be logged in to search")
             return
         try:
             result = self.session.search(query)
@@ -189,19 +189,19 @@ def do_search(self, query):
             self.logger.warning(e)
             return
         self.logger.info(
-            '%d tracks, %d albums, %d artists, and %d playlists found.',
+            "%d tracks, %d albums, %d artists, and %d playlists found.",
             result.track_total,
             result.album_total,
             result.artist_total,
             result.playlist_total,
         )
-        self.logger.info('Top tracks:')
+        self.logger.info("Top tracks:")
         for track in result.tracks:
             self.logger.info(
-                '[%s] %s - %s', track.link, track.artists[0].name, track.name
+                "[%s] %s - %s", track.link, track.artists[0].name, track.name
             )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     logging.basicConfig(level=logging.INFO)
     Commander().cmdloop()

pyproject.toml

@@ -4,7 +4,6 @@ requires = ["setuptools >= 30.3.0", "wheel"]
 
 [tool.black]
 target-version = ["py27"]
-skip-string-normalization = true
 
 
 [tool.isort]

setup.py

@@ -2,5 +2,5 @@
 
 setup(
     # XXX Setting cffi_modules in setup.cfg does not have any effect.
-    cffi_modules=['spotify/_spotify_build.py:ffi']
+    cffi_modules=["spotify/_spotify_build.py:ffi"]
 )

spotify/__init__.py

@@ -4,7 +4,7 @@
 
 import pkg_resources
 
-__version__ = pkg_resources.get_distribution('pyspotify').version
+__version__ = pkg_resources.get_distribution("pyspotify").version
 
 
 # Global reentrant lock to be held whenever libspotify functions are called or
@@ -28,7 +28,7 @@ def _setup_logging():
     """
     import logging
 
-    logger = logging.getLogger('spotify')
+    logger = logging.getLogger("spotify")
     handler = logging.NullHandler()
     logger.addHandler(handler)
 
@@ -65,7 +65,7 @@ def wrapper(*args, **kwargs):
         with _lock:
             return f(*args, **kwargs)
 
-    if not hasattr(wrapper, '__wrapped__'):
+    if not hasattr(wrapper, "__wrapped__"):
         # Workaround for Python < 3.2
         wrapper.__wrapped__ = f
     return wrapper
@@ -80,7 +80,7 @@ class _SerializedLib(object):
     def __init__(self, lib):
         for name in dir(lib):
             attr = getattr(lib, name)
-            if name.startswith('sp_') and callable(attr):
+            if name.startswith("sp_") and callable(attr):
                 attr = serialized(attr)
             setattr(self, name, attr)