diff options
| author | Sergey M․ <dstftw@gmail.com> | 2019-05-11 03:56:22 +0700 |
|---|---|---|
| committer | Sergey M․ <dstftw@gmail.com> | 2019-05-11 03:57:40 +0700 |
| commit | 3089bc748c0fe72a0361bce3f5e2fbab25175236 (patch) | |
| tree | 2dbe8468137470f25f851b8d06778e2dcab87d25 /youtube_dl/postprocessor | |
| parent | d23e85515a8f58e276e8ac07bf1fa19f4f1aaec8 (diff) | |
| download | youtube-dl-3089bc748c0fe72a0361bce3f5e2fbab25175236.tar.gz youtube-dl-3089bc748c0fe72a0361bce3f5e2fbab25175236.tar.xz youtube-dl-3089bc748c0fe72a0361bce3f5e2fbab25175236.zip | |
Fix W504 and disable W503 (closes #20863)
Diffstat (limited to 'youtube_dl/postprocessor')
| -rw-r--r-- | youtube_dl/postprocessor/ffmpeg.py | 10 | ||||
| -rw-r--r-- | youtube_dl/postprocessor/xattrpp.py | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/youtube_dl/postprocessor/ffmpeg.py b/youtube_dl/postprocessor/ffmpeg.py index 5bcb00ac0..70416c25e 100644 --- a/youtube_dl/postprocessor/ffmpeg.py +++ b/youtube_dl/postprocessor/ffmpeg.py @@ -221,9 +221,9 @@ class FFmpegPostProcessor(PostProcessor): # avconv does not have repeat option if self.basename == 'ffmpeg': cmd += [encodeArgument('-loglevel'), encodeArgument('repeat+info')] - cmd += (files_cmd + - [encodeArgument(o) for o in opts] + - [encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) + cmd += (files_cmd + + [encodeArgument(o) for o in opts] + + [encodeFilename(self._ffmpeg_filename_argument(out_path), True)]) if self._downloader.params.get('verbose', False): self._downloader.to_screen('[debug] ffmpeg command line: %s' % shell_quote(cmd)) @@ -326,8 +326,8 @@ class FFmpegExtractAudioPP(FFmpegPostProcessor): information['ext'] = extension # If we download foo.mp3 and convert it to... foo.mp3, then don't delete foo.mp3, silly. - if (new_path == path or - (self._nopostoverwrites and os.path.exists(encodeFilename(new_path)))): + if (new_path == path + or (self._nopostoverwrites and os.path.exists(encodeFilename(new_path)))): self._downloader.to_screen('[ffmpeg] Post-process file %s exists, skipping' % new_path) return [], information diff --git a/youtube_dl/postprocessor/xattrpp.py b/youtube_dl/postprocessor/xattrpp.py index b0aed9ca7..814dabecf 100644 --- a/youtube_dl/postprocessor/xattrpp.py +++ b/youtube_dl/postprocessor/xattrpp.py @@ -64,8 +64,8 @@ class XAttrMetadataPP(PostProcessor): except XAttrMetadataError as e: if e.reason == 'NO_SPACE': self._downloader.report_warning( - 'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. ' + - (('Some ' if num_written else '') + 'extended attributes are not written.').capitalize()) + 'There\'s no disk space left, disk quota exceeded or filesystem xattr limit exceeded. ' + + (('Some ' if num_written else '') + 'extended attributes are not written.').capitalize()) elif e.reason == 'VALUE_TOO_LONG': self._downloader.report_warning( 'Unable to write extended attributes due to too long values.') |