From ff57b2997102f0bf59941794f31ec4ba2f2adc64 Mon Sep 17 00:00:00 2001
From: Katie Pratt <katieannpratt@gmail.com>
Date: Sun, 3 Nov 2019 20:09:04 -0500
Subject: [PATCH] correcting for flake8 errors

---
 youtube_dl/__init__.py             |  5 +----
 youtube_dl/options.py              |  3 +--
 youtube_dl/postprocessor/ffmpeg.py | 29 ++++++++++++++++-------------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/youtube_dl/__init__.py b/youtube_dl/__init__.py
index 94d19f51b..2819bf002 100644
--- a/youtube_dl/__init__.py
+++ b/youtube_dl/__init__.py
@@ -12,7 +12,6 @@ import random
 import sys
 import json
 
-
 from .options import (
     parseOpts,
 )
@@ -281,13 +280,11 @@ def _real_main(argv=None):
             postprocessors.append({
                 'key': 'FFmpegMetadata',
                 'preferredmetadatatoembed': preferredmetadatatoembed,
-                })
+            })
         else:
             postprocessors.append({
                 'key': 'FFmpegMetadata'
             })
-        
-
     if opts.convertsubtitles:
         postprocessors.append({
             'key': 'FFmpegSubtitlesConvertor',
diff --git a/youtube_dl/options.py b/youtube_dl/options.py
index 9b77b49df..1812267ab 100644
--- a/youtube_dl/options.py
+++ b/youtube_dl/options.py
@@ -830,8 +830,7 @@ def parseOpts(overrideArguments=None):
              'inputted from the info_list, only one will be used. Fields '
              'curently supported for metadata override are '
              '((info_list) => (meta_list)):\n {}'.format(',\n'.join(
-                 ['({}) => ({})'.format(*[', '.join(a) for a in reversed(x)]) for x in get_metadata_override_elements()]
-                 )))
+                 ['({}) => ({})'.format(*[', '.join(a) for a in reversed(x)]) for x in get_metadata_override_elements()])))
     postproc.add_option(
         '--preferred-metadata-json'
     )
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py
index 8270990a5..c4fa9bb63 100644
--- a/youtube_dl/postprocessor/ffmpeg.py
+++ b/youtube_dl/postprocessor/ffmpeg.py
@@ -48,18 +48,19 @@ ACODECS = {
 
 
 METADATA_TO_INFO_LIST_ELEMENTS = [
-    ['title', ('track','title')]
-    , ['date', 'upload_date']
-    , [('description','comment'), 'description']
-    , ['purl','webpage_url']
-    , ['track','track_number']
-    , ['artist', ('artist', 'creator', 'uploader', 'uploader_id')]
-    , ['genre']
-    , ['album']
-    , ['album_artists']
-    , ['disc', 'disc_number']
+    ['title', ('track', 'title')],
+    ['date', 'upload_date'],
+    [('description', 'comment'), 'description'],
+    ['purl', 'webpage_url'],
+    ['track', 'track_number'],
+    ['artist', ('artist', 'creator', 'uploader', 'uploader_id')],
+    ['genre'],
+    ['album'],
+    ['album_artists'],
+    ['disc', 'disc_number']
 ]
 
+
 def get_meta_and_info_lists(meta_to_info_list):
     convert_to_tuple = lambda x: tuple(x) if isinstance(x, (list, tuple)) else tuple([x])
     if any(isinstance(x, (list, tuple)) for x in meta_to_info_list):
@@ -70,12 +71,14 @@ def get_meta_and_info_lists(meta_to_info_list):
         info_list = meta_list
     return (meta_list, info_list)
 
+
 def get_metadata_override_elements():
     elements = []
     for metadata_to_info_lists in METADATA_TO_INFO_LIST_ELEMENTS:
         elements.append(get_meta_and_info_lists(metadata_to_info_lists))
     return elements
 
+
 class FFmpegPostProcessorError(PostProcessingError):
     pass
 
@@ -463,9 +466,9 @@ class FFmpegMetadataPP(FFmpegPostProcessor):
     def __init__(self, downloader=None, preferredmetadatatoembed=None):
         super(FFmpegMetadataPP, self).__init__(downloader)
         assert (
-            (isinstance(preferredmetadatatoembed, dict) or
-            preferredmetadatatoembed != None)
-            ), 'preferredmetadatatoembed must be a dictionary, if provided'
+            (isinstance(preferredmetadatatoembed, dict)
+                or preferredmetadatatoembed is not None)
+        ), 'preferredmetadatatoembed must be a dictionary, if provided'
         self._preferredmetadatatoembed = preferredmetadatatoembed
 
     def run(self, info):