From 54119375a4e6d156e9e34fa50f2dbed4b725690f Mon Sep 17 00:00:00 2001 From: DevilXD Date: Tue, 20 Sep 2022 15:38:43 +0200 Subject: [PATCH 1/6] Fix ClientSession.timeout typing --- aiohttp/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aiohttp/client.py b/aiohttp/client.py index a97190d078a..b8c0e429495 100644 --- a/aiohttp/client.py +++ b/aiohttp/client.py @@ -1006,7 +1006,7 @@ def requote_redirect_url(self) -> bool: return self._requote_redirect_url @property - def timeout(self) -> Union[object, ClientTimeout]: + def timeout(self) -> ClientTimeout: """Timeout for the session.""" return self._timeout From 31905a474c22e6ea0963a3448e81423abf67f6ad Mon Sep 17 00:00:00 2001 From: DevilXD Date: Tue, 20 Sep 2022 15:57:43 +0200 Subject: [PATCH 2/6] Add a news fragment --- CHANGES/6917.misc | 1 + 1 file changed, 1 insertion(+) create mode 100644 CHANGES/6917.misc diff --git a/CHANGES/6917.misc b/CHANGES/6917.misc new file mode 100644 index 00000000000..167bd4f4082 --- /dev/null +++ b/CHANGES/6917.misc @@ -0,0 +1 @@ +Fix ClientSession.timeout having incorrect typing. From 229b73d039a880a1ac8f86ca0f26497f47e30068 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 18:36:13 +0200 Subject: [PATCH 3/6] Update the change note to reflect the type change --- CHANGES/6917.misc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES/6917.misc b/CHANGES/6917.misc index 167bd4f4082..468e21a2b0f 100644 --- a/CHANGES/6917.misc +++ b/CHANGES/6917.misc @@ -1 +1,3 @@ -Fix ClientSession.timeout having incorrect typing. +Dropped the :class:`object` type possibility from +the :py:attr:`aiohttp.ClientSession.timeout` +property return type declaration. From 3be3fb93f28c4bfc267a686e1e56d7e8d9c9d3c0 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 18:37:09 +0200 Subject: [PATCH 4/6] Switch the change note type to "bugfix" --- CHANGES/{6917.misc => 6917.bugfix} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename CHANGES/{6917.misc => 6917.bugfix} (100%) diff --git a/CHANGES/6917.misc b/CHANGES/6917.bugfix similarity index 100% rename from CHANGES/6917.misc rename to CHANGES/6917.bugfix From fee3de1b7052e597e81aad04be012811203c5c43 Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 18:38:14 +0200 Subject: [PATCH 5/6] Alias the change not to the "doc" category too --- CHANGES/6917.doc | 1 + 1 file changed, 1 insertion(+) create mode 120000 CHANGES/6917.doc diff --git a/CHANGES/6917.doc b/CHANGES/6917.doc new file mode 120000 index 00000000000..b8eddb8d6dc --- /dev/null +++ b/CHANGES/6917.doc @@ -0,0 +1 @@ +6917.bugfix \ No newline at end of file From 9b77aa49791b3801e44e07739856e230e06e67af Mon Sep 17 00:00:00 2001 From: Sviatoslav Sydorenko Date: Tue, 20 Sep 2022 18:38:51 +0200 Subject: [PATCH 6/6] Link the change notes to PR #6923 --- CHANGES/6923.bugfix | 1 + CHANGES/6923.doc | 1 + 2 files changed, 2 insertions(+) create mode 120000 CHANGES/6923.bugfix create mode 120000 CHANGES/6923.doc diff --git a/CHANGES/6923.bugfix b/CHANGES/6923.bugfix new file mode 120000 index 00000000000..b8eddb8d6dc --- /dev/null +++ b/CHANGES/6923.bugfix @@ -0,0 +1 @@ +6917.bugfix \ No newline at end of file diff --git a/CHANGES/6923.doc b/CHANGES/6923.doc new file mode 120000 index 00000000000..c05397962f9 --- /dev/null +++ b/CHANGES/6923.doc @@ -0,0 +1 @@ +6917.doc \ No newline at end of file