From d88190c73e19cf19fa979fafb9327a714051864f Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 14:50:08 +0300 Subject: [PATCH 01/10] Enable ruff DTZ005 rule --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 09093433a47a..5187491e5ee7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -2,7 +2,6 @@ lint.ignore = [ # `ruff rule S101` for a description of that rule "B904", # Within an `except` clause, raise exceptions with `raise ... from err` -- FIX ME "B905", # `zip()` without an explicit `strict=` parameter -- FIX ME - "DTZ005", # The use of `datetime.datetime.now()` without `tzinfo` argument is not allowed -- FIX ME "E741", # Ambiguous variable name 'l' -- FIX ME "EM101", # Exception must not use a string literal, assign to variable first "EXE001", # Shebang is present but file is not executable" -- FIX ME From baeb0fea1dd0f2ca7ee91241fed19aa841a645d5 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 14:57:35 +0300 Subject: [PATCH 02/10] Fix other/gauss_easter.py --- other/gauss_easter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/gauss_easter.py b/other/gauss_easter.py index 7ccea7f5bbf0..807c6dde20c6 100644 --- a/other/gauss_easter.py +++ b/other/gauss_easter.py @@ -56,5 +56,5 @@ def gauss_easter(year: int) -> datetime: if __name__ == "__main__": for year in (1994, 2000, 2010, 2021, 2023): - tense = "will be" if year > datetime.now().year else "was" + tense = "will be" if year > datetime.now(tzinfo=UTC).year else "was" print(f"Easter in {year} {tense} {gauss_easter(year)}") From 32b47210c92af82d26c60bb2101b96a5b8d15fbe Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 14:59:33 +0300 Subject: [PATCH 03/10] Fix --- other/gauss_easter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/other/gauss_easter.py b/other/gauss_easter.py index 807c6dde20c6..6cf1990bff93 100644 --- a/other/gauss_easter.py +++ b/other/gauss_easter.py @@ -56,5 +56,5 @@ def gauss_easter(year: int) -> datetime: if __name__ == "__main__": for year in (1994, 2000, 2010, 2021, 2023): - tense = "will be" if year > datetime.now(tzinfo=UTC).year else "was" + tense = "will be" if year > datetime.now(tz=UTC).year else "was" print(f"Easter in {year} {tense} {gauss_easter(year)}") From 905568c8fd92e0eac2b5c2a532e514a61669157c Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 15:01:06 +0300 Subject: [PATCH 04/10] Fix web_programming/instagram_pic.py --- web_programming/instagram_pic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_programming/instagram_pic.py b/web_programming/instagram_pic.py index 2630c8659232..03c6f9703104 100644 --- a/web_programming/instagram_pic.py +++ b/web_programming/instagram_pic.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import UTC, datetime import requests from bs4 import BeautifulSoup @@ -36,7 +36,7 @@ def download_image(url: str) -> str: if not image_data: return f"Failed to download the image from {image_url}." - file_name = f"{datetime.now():%Y-%m-%d_%H:%M:%S}.jpg" + file_name = f"{datetime.now(tz=UTC):%Y-%m-%d_%H:%M:%S}.jpg" with open(file_name, "wb") as out_file: out_file.write(image_data) return f"Image downloaded and saved in the file {file_name}" From 9907b20a92b14a94d54e62f0ff450486c7963e91 Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 15:02:33 +0300 Subject: [PATCH 05/10] Fix web_programming/instagram_video.py --- web_programming/instagram_video.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_programming/instagram_video.py b/web_programming/instagram_video.py index 243cece1a50e..bb5d9159ffe6 100644 --- a/web_programming/instagram_video.py +++ b/web_programming/instagram_video.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import UTC, datetime import requests @@ -11,7 +11,7 @@ def download_video(url: str) -> bytes: if __name__ == "__main__": url = input("Enter Video/IGTV url: ").strip() - file_name = f"{datetime.now():%Y-%m-%d_%H:%M:%S}.mp4" + file_name = f"{datetime.now(tz=UTC):%Y-%m-%d_%H:%M:%S}.mp4" with open(file_name, "wb") as fp: fp.write(download_video(url)) print(f"Done. Video saved to disk as {file_name}.") From a16d2ac9ce4575d7359e943ddc874dc264278d3e Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 25 Mar 2024 21:19:54 +0100 Subject: [PATCH 06/10] Apply suggestions from code review --- other/gauss_easter.py | 2 +- web_programming/instagram_pic.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/other/gauss_easter.py b/other/gauss_easter.py index 6cf1990bff93..8c8c37c92796 100644 --- a/other/gauss_easter.py +++ b/other/gauss_easter.py @@ -55,6 +55,6 @@ def gauss_easter(year: int) -> datetime: if __name__ == "__main__": - for year in (1994, 2000, 2010, 2021, 2023): + for year in (1994, 2000, 2010, 2021, 2023, 2032, 2100): tense = "will be" if year > datetime.now(tz=UTC).year else "was" print(f"Easter in {year} {tense} {gauss_easter(year)}") diff --git a/web_programming/instagram_pic.py b/web_programming/instagram_pic.py index 03c6f9703104..d7f90495e3ee 100644 --- a/web_programming/instagram_pic.py +++ b/web_programming/instagram_pic.py @@ -36,7 +36,7 @@ def download_image(url: str) -> str: if not image_data: return f"Failed to download the image from {image_url}." - file_name = f"{datetime.now(tz=UTC):%Y-%m-%d_%H:%M:%S}.jpg" + file_name = f"{datetime.now(tz=None):%Y-%m-%d_%H:%M:%S}.jpg" with open(file_name, "wb") as out_file: out_file.write(image_data) return f"Image downloaded and saved in the file {file_name}" From a74d61b6f5e16c8dad3f95b21303e98dbc7b82ae Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 25 Mar 2024 21:20:22 +0100 Subject: [PATCH 07/10] Update instagram_pic.py --- web_programming/instagram_pic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_programming/instagram_pic.py b/web_programming/instagram_pic.py index d7f90495e3ee..e94245c96646 100644 --- a/web_programming/instagram_pic.py +++ b/web_programming/instagram_pic.py @@ -1,4 +1,4 @@ -from datetime import UTC, datetime +from datetime import datetime import requests from bs4 import BeautifulSoup From 2387201a0b508d1cd02e17b8f322294179e67731 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 25 Mar 2024 21:22:43 +0100 Subject: [PATCH 08/10] datetime.now(tz=UTC).astimezone() --- web_programming/instagram_pic.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web_programming/instagram_pic.py b/web_programming/instagram_pic.py index e94245c96646..2d987c1766dc 100644 --- a/web_programming/instagram_pic.py +++ b/web_programming/instagram_pic.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import UTC, datetime import requests from bs4 import BeautifulSoup @@ -36,7 +36,7 @@ def download_image(url: str) -> str: if not image_data: return f"Failed to download the image from {image_url}." - file_name = f"{datetime.now(tz=None):%Y-%m-%d_%H:%M:%S}.jpg" + file_name = f"{datetime.now(tz=UTC).astimezone():%Y-%m-%d_%H:%M:%S}.jpg" with open(file_name, "wb") as out_file: out_file.write(image_data) return f"Image downloaded and saved in the file {file_name}" From 82c937b51516755a12674669fcf06c7882e29655 Mon Sep 17 00:00:00 2001 From: Christian Clauss Date: Mon, 25 Mar 2024 21:28:06 +0100 Subject: [PATCH 09/10] .astimezone() --- web_programming/instagram_video.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_programming/instagram_video.py b/web_programming/instagram_video.py index bb5d9159ffe6..46c0cee4d0f5 100644 --- a/web_programming/instagram_video.py +++ b/web_programming/instagram_video.py @@ -11,7 +11,7 @@ def download_video(url: str) -> bytes: if __name__ == "__main__": url = input("Enter Video/IGTV url: ").strip() - file_name = f"{datetime.now(tz=UTC):%Y-%m-%d_%H:%M:%S}.mp4" + file_name = f"{datetime.now(tz=UTC.astimezone()):%Y-%m-%d_%H:%M:%S}.mp4" with open(file_name, "wb") as fp: fp.write(download_video(url)) print(f"Done. Video saved to disk as {file_name}.") From f27ca2e05d59a59ca3e3a1ea9df1a9fe7aa833cd Mon Sep 17 00:00:00 2001 From: MaximSmolskiy Date: Mon, 25 Mar 2024 23:45:26 +0300 Subject: [PATCH 10/10] Fix --- web_programming/instagram_video.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_programming/instagram_video.py b/web_programming/instagram_video.py index 46c0cee4d0f5..1f1b0e297034 100644 --- a/web_programming/instagram_video.py +++ b/web_programming/instagram_video.py @@ -11,7 +11,7 @@ def download_video(url: str) -> bytes: if __name__ == "__main__": url = input("Enter Video/IGTV url: ").strip() - file_name = f"{datetime.now(tz=UTC.astimezone()):%Y-%m-%d_%H:%M:%S}.mp4" + file_name = f"{datetime.now(tz=UTC).astimezone():%Y-%m-%d_%H:%M:%S}.mp4" with open(file_name, "wb") as fp: fp.write(download_video(url)) print(f"Done. Video saved to disk as {file_name}.")