Sourcery refactored master branch

pytube/captions.py

@@ -116,11 +116,7 @@ def download(
 
         filename += f" ({self.code})"
 
-        if srt:
-            filename += ".srt"
-        else:
-            filename += ".xml"
-
+        filename += '.srt' if srt else '.xml'
         file_path = os.path.join(target_directory(output_path), filename)
 
         with open(file_path, "w", encoding="utf-8") as file_handle:

pytube/cli.py

@@ -158,11 +158,11 @@ def build_playback_report(youtube: YouTube) -> None:
     ts = int(dt.datetime.utcnow().timestamp())
     fp = os.path.join(os.getcwd(), f"yt-video-{youtube.video_id}-{ts}.json.gz")
 
-    js = youtube.js
-    watch_html = youtube.watch_html
-    vid_info = youtube.vid_info
-
     with gzip.open(fp, "wb") as fh:
+        js = youtube.js
+        watch_html = youtube.watch_html
+        vid_info = youtube.vid_info
+
         fh.write(
             json.dumps(
                 {

pytube/extract.py

@@ -273,17 +273,17 @@ def apply_descrambler(stream_data: Dict, key: str) -> None:
     {'foo': [{'bar': '1', 'var': 'test'}, {'em': '5', 't': 'url encoded'}]}
 
     """
-    otf_type = "FORMAT_STREAM_TYPE_OTF"
-
     if key == "url_encoded_fmt_stream_map" and not stream_data.get(
-        "url_encoded_fmt_stream_map"
-    ):
+            "url_encoded_fmt_stream_map"
+        ):
         formats = json.loads(stream_data["player_response"])["streamingData"]["formats"]
         formats.extend(
             json.loads(stream_data["player_response"])["streamingData"][
                 "adaptiveFormats"
             ]
         )
+        otf_type = "FORMAT_STREAM_TYPE_OTF"
+
         try:
             stream_data[key] = [
                 {

pytube/helpers.py

@@ -53,7 +53,7 @@ def safe_filename(s: str, max_length: int = 255) -> str:
         A sanitized string.
     """
     # Characters in range 0-31 (0x00-0x1F) are not allowed in ntfs filenames.
-    ntfs_characters = [chr(i) for i in range(0, 31)]
+    ntfs_characters = [chr(i) for i in range(31)]
     characters = [
         r'"',
         r"\#",

pytube/itags.py

@@ -131,10 +131,7 @@ def get_format_profile(itag: int) -> Dict:
         YouTube format identifier code.
     """
     itag = int(itag)
-    if itag in ITAGS:
-        res, bitrate = ITAGS[itag]
-    else:
-        res, bitrate = None, None
+    res, bitrate = ITAGS[itag] if itag in ITAGS else (None, None)
     return {
         "resolution": res,
         "abr": bitrate,

pytube/streams.py

@@ -230,7 +230,7 @@ def download(
 
         bytes_remaining = self.filesize
         logger.debug(
-            "downloading (%s total bytes) file to %s", self.filesize, file_path,
+            'downloading (%s total bytes) file to %s', bytes_remaining, file_path
         )
 
         with open(file_path, "wb") as fh:
@@ -265,10 +265,7 @@ def stream_to_buffer(self, buffer: BinaryIO) -> None:
         :rtype: io.BytesIO buffer
         """
         bytes_remaining = self.filesize
-        logger.info(
-            "downloading (%s total bytes) file to buffer", self.filesize,
-        )
-
+        logger.info('downloading (%s total bytes) file to buffer', bytes_remaining)
         for chunk in request.stream(self.url):
             # reduce the (bytes) remainder by the length of the chunk.
             bytes_remaining -= len(chunk)

tests/test_cli.py

@@ -368,15 +368,15 @@ def test_ffmpeg_process_res_should_download(_ffmpeg_downloader, youtube):
 @mock.patch("pytube.cli.YouTube")
 @mock.patch("pytube.cli._ffmpeg_downloader")
 def test_ffmpeg_process_res_none_should_not_download(_ffmpeg_downloader, youtube):
-    # Given
-    target = "/target"
     streams = MagicMock()
     youtube.streams = streams
     streams.filter.return_value.first.return_value = None
     audio_stream = MagicMock()
     streams.get_audio_only.return_value = audio_stream
     # When
     with pytest.raises(SystemExit):
+        # Given
+        target = "/target"
         cli.ffmpeg_process(youtube, "XYZp", target)
     # Then
     _ffmpeg_downloader.assert_not_called()
@@ -405,8 +405,6 @@ def test_ffmpeg_process_audio_none_should_fallback_download(
 @mock.patch("pytube.cli.YouTube")
 @mock.patch("pytube.cli._ffmpeg_downloader")
 def test_ffmpeg_process_audio_fallback_none_should_exit(_ffmpeg_downloader, youtube):
-    # Given
-    target = "/target"
     streams = MagicMock()
     youtube.streams = streams
     stream = MagicMock()
@@ -418,6 +416,8 @@ def test_ffmpeg_process_audio_fallback_none_should_exit(_ffmpeg_downloader, yout
     streams.get_audio_only.return_value = None
     # When
     with pytest.raises(SystemExit):
+        # Given
+        target = "/target"
         cli.ffmpeg_process(youtube, "best", target)
     # Then
     _ffmpeg_downloader.assert_not_called()