Refactor code to use HTTPStatus instead of http.server #6903

Zeesky-code · 2022-09-01T12:50:34Z

What do these changes do?

Refactor code to use HTTPStatus instead of http.server

Fixes #6901

for more information, see https://pre-commit.ci

lgtm-com · 2022-09-01T13:01:25Z

This pull request introduces 1 alert when merging 0510ac8 into 6451652 - view on LGTM.com

new alerts:

1 for Unused import

aiohttp/web_response.py

aiohttp/http.py

codecov · 2022-09-01T13:28:12Z

Codecov Report

Merging #6903 (75bdecb) into master (905e062) will decrease coverage by 0.00%.
The diff coverage is 71.42%.

@@            Coverage Diff             @@
##           master    #6903      +/-   ##
==========================================
- Coverage   97.50%   97.50%   -0.01%     
==========================================
  Files         103      103              
  Lines       30049    30047       -2     
  Branches     3660     3660              
==========================================
- Hits        29298    29296       -2     
  Misses        569      569              
  Partials      182      182

Flag	Coverage Δ
CI-GHA	`97.40% <71.42%> (-0.01%)`	⬇️
OS-Linux	`97.04% <71.42%> (-0.01%)`	⬇️
OS-Windows	`95.34% <57.14%> (-0.01%)`	⬇️
OS-macOS	`96.63% <57.14%> (-0.01%)`	⬇️
Py-3.10.8	`97.15% <71.42%> (-0.01%)`	⬇️
Py-3.11.0	`96.55% <71.42%> (-0.01%)`	⬇️
Py-3.7.15	`96.87% <71.42%> (-0.01%)`	⬇️
Py-3.7.9	`95.22% <57.14%> (-0.01%)`	⬇️
Py-3.8.10	`95.12% <57.14%> (-0.01%)`	⬇️
Py-3.8.14	`96.77% <71.42%> (-0.01%)`	⬇️
Py-3.9.13	`95.11% <57.14%> (-0.01%)`	⬇️
Py-3.9.14	`96.51% <57.14%> (-0.01%)`	⬇️
Py-3.9.15	`96.75% <71.42%> (-0.01%)`	⬇️
Py-pypy7.3.9	`96.38% <57.14%> (-0.01%)`	⬇️
VM-macos	`96.63% <57.14%> (-0.01%)`	⬇️
VM-ubuntu	`97.04% <71.42%> (-0.01%)`	⬇️
VM-windows	`95.34% <57.14%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
aiohttp/http.py	`100.00% <ø> (ø)`
aiohttp/connector.py	`94.62% <50.00%> (ø)`
aiohttp/web_response.py	`98.41% <75.00%> (+<0.01%)`	⬆️
tests/test_imports.py	`93.54% <100.00%> (ø)`

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

webknjaz · 2022-09-22T16:49:46Z

@Zeesky-code thank you for the contribution! This patch requires a change note per https://github.com/aio-libs/aiohttp/tree/master/CHANGES#adding-change-notes-with-your-prs. Could you add it and follow-up on other discussions here?

aiohttp/web_response.py

Zeesky-code · 2022-09-23T07:43:32Z

@Zeesky-code thank you for the contribution! This patch requires a change note per https://github.com/aio-libs/aiohttp/tree/master/CHANGES#adding-change-notes-with-your-prs. Could you add it and follow-up on other discussions here?

Sure, I've added the change note.

for more information, see https://pre-commit.ci

patchback · 2022-11-28T18:43:43Z

Backport to 3.9: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply 549e6a4 on top of patchback/backports/3.9/549e6a461a4d2177fffba098528ec754dcf48e76/pr-6903

Backporting merged PR #6903 into master

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/aio-libs/aiohttp.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.9/549e6a461a4d2177fffba098528ec754dcf48e76/pr-6903 upstream/3.9

Now, cherry-pick PR Refactor code to use HTTPStatus instead of http.server #6903 contents into that branch:
```
$ git cherry-pick -x 549e6a461a4d2177fffba098528ec754dcf48e76
```
If it'll yell at you with something like fatal: Commit 549e6a461a4d2177fffba098528ec754dcf48e76 is a merge but no -m option was given., add -m 1 as follows intead:
```
$ git cherry-pick -m1 -x 549e6a461a4d2177fffba098528ec754dcf48e76
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Refactor code to use HTTPStatus instead of http.server #6903 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.9/549e6a461a4d2177fffba098528ec754dcf48e76/pr-6903

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

Co-authored-by: Zainab Lawal <zainablaw1012@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

[![Mend Renovate logo banner](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [aiohttp](https://github.com/aio-libs/aiohttp) | `==3.8.6` -> `==3.9.0` | [![age](https://developer.mend.io/api/mc/badges/age/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://developer.mend.io/api/mc/badges/adoption/pypi/aiohttp/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://developer.mend.io/api/mc/badges/compatibility/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://developer.mend.io/api/mc/badges/confidence/pypi/aiohttp/3.8.6/3.9.0?slim=true)](https://docs.renovatebot.com/merge-confidence/) | --- ### Release Notes <details> <summary>aio-libs/aiohttp (aiohttp)</summary> ### [`v3.9.0`](https://github.com/aio-libs/aiohttp/blob/HEAD/CHANGES.rst#390-2023-11-18) [Compare Source](https://github.com/aio-libs/aiohttp/compare/v3.8.6...v3.9.0) \================== ## Features - Introduced `AppKey` for static typing support of `Application` storage. See https://docs.aiohttp.org/en/stable/web_advanced.html#application-s-config `#5864 <https://github.com/aio-libs/aiohttp/issues/5864>`\_ - Added a graceful shutdown period which allows pending tasks to complete before the application's cleanup is called. The period can be adjusted with the `shutdown_timeout` parameter. -- by :user:`Dreamsorcerer`. See https://docs.aiohttp.org/en/latest/web_advanced.html#graceful-shutdown `#7188 <https://github.com/aio-libs/aiohttp/issues/7188>`\_ - Added `handler_cancellation <https://docs.aiohttp.org/en/stable/web_advanced.html#web-handler-cancellation>`\_ parameter to cancel web handler on client disconnection. -- by :user:`mosquito` This (optionally) reintroduces a feature removed in a previous release. Recommended for those looking for an extra level of protection against denial-of-service attacks. `#7056 <https://github.com/aio-libs/aiohttp/issues/7056>`\_ - Added support for setting response header parameters `max_line_size` and `max_field_size`. `#2304 <https://github.com/aio-libs/aiohttp/issues/2304>`\_ - Added `auto_decompress` parameter to `ClientSession.request` to override `ClientSession._auto_decompress`. -- by :user:`Daste745` `#3751 <https://github.com/aio-libs/aiohttp/issues/3751>`\_ - Changed `raise_for_status` to allow a coroutine. `#3892 <https://github.com/aio-libs/aiohttp/issues/3892>`\_ - Added client brotli compression support (optional with runtime check). `#5219 <https://github.com/aio-libs/aiohttp/issues/5219>`\_ - Added `client_max_size` to `BaseRequest.clone()` to allow overriding the request body size. -- :user:`anesabml`. `#5704 <https://github.com/aio-libs/aiohttp/issues/5704>`\_ - Added a middleware type alias `aiohttp.typedefs.Middleware`. `#5898 <https://github.com/aio-libs/aiohttp/issues/5898>`\_ - Exported `HTTPMove` which can be used to catch any redirection request that has a location -- :user:`dreamsorcerer`. `#6594 <https://github.com/aio-libs/aiohttp/issues/6594>`\_ - Changed the `path` parameter in `web.run_app()` to accept a `pathlib.Path` object. `#6839 <https://github.com/aio-libs/aiohttp/issues/6839>`\_ - Performance: Skipped filtering `CookieJar` when the jar is empty or all cookies have expired. `#7819 <https://github.com/aio-libs/aiohttp/issues/7819>`\_ - Performance: Only check origin if insecure scheme and there are origins to treat as secure, in `CookieJar.filter_cookies()`. `#7821 <https://github.com/aio-libs/aiohttp/issues/7821>`\_ - Performance: Used timestamp instead of `datetime` to achieve faster cookie expiration in `CookieJar`. `#7824 <https://github.com/aio-libs/aiohttp/issues/7824>`\_ - Added support for passing a custom server name parameter to HTTPS connection. `#7114 <https://github.com/aio-libs/aiohttp/issues/7114>`\_ - Added support for using Basic Auth credentials from :file:`.netrc` file when making HTTP requests with the :py:class:`~aiohttp.ClientSession` `trust_env` argument is set to `True`. -- by :user:`yuvipanda`. `#7131 <https://github.com/aio-libs/aiohttp/issues/7131>`\_ - Turned access log into no-op when the logger is disabled. `#7240 <https://github.com/aio-libs/aiohttp/issues/7240>`\_ - Added typing information to `RawResponseMessage`. -- by :user:`Gobot1234` `#7365 <https://github.com/aio-libs/aiohttp/issues/7365>`\_ - Removed `async-timeout` for Python 3.11+ (replaced with `asyncio.timeout()` on newer releases). `#7502 <https://github.com/aio-libs/aiohttp/issues/7502>`\_ - Added support for `brotlicffi` as an alternative to `brotli` (fixing Brotli support on PyPy). `#7611 <https://github.com/aio-libs/aiohttp/issues/7611>`\_ - Added `WebSocketResponse.get_extra_info()` to access a protocol transport's extra info. `#7078 <https://github.com/aio-libs/aiohttp/issues/7078>`\_ - Allow `link` argument to be set to None/empty in HTTP 451 exception. `#7689 <https://github.com/aio-libs/aiohttp/issues/7689>`\_ ## Bugfixes - Implemented stripping the trailing dots from fully-qualified domain names in `Host` headers and TLS context when acting as an HTTP client. This allows the client to connect to URLs with FQDN host name like `https://example.com./`. \-- by :user:`martin-sucha`. `#3636 <https://github.com/aio-libs/aiohttp/issues/3636>`\_ - Fixed client timeout not working when incoming data is always available without waiting. -- by :user:`Dreamsorcerer`. `#5854 <https://github.com/aio-libs/aiohttp/issues/5854>`\_ - Fixed `readuntil` to work with a delimiter of more than one character. `#6701 <https://github.com/aio-libs/aiohttp/issues/6701>`\_ - Added `__repr__` to `EmptyStreamReader` to avoid `AttributeError`. `#6916 <https://github.com/aio-libs/aiohttp/issues/6916>`\_ - Fixed bug when using `TCPConnector` with `ttl_dns_cache=0`. `#7014 <https://github.com/aio-libs/aiohttp/issues/7014>`\_ - Fixed response returned from expect handler being thrown away. -- by :user:`Dreamsorcerer` `#7025 <https://github.com/aio-libs/aiohttp/issues/7025>`\_ - Avoided raising `UnicodeDecodeError` in multipart and in HTTP headers parsing. `#7044 <https://github.com/aio-libs/aiohttp/issues/7044>`\_ - Changed `sock_read` timeout to start after writing has finished, avoiding read timeouts caused by an unfinished write. -- by :user:`dtrifiro` `#7149 <https://github.com/aio-libs/aiohttp/issues/7149>`\_ - Fixed missing query in tracing method URLs when using `yarl` 1.9+. `#7259 <https://github.com/aio-libs/aiohttp/issues/7259>`\_ - Changed max 32-bit timestamp to an aware datetime object, for consistency with the non-32-bit one, and to avoid a `DeprecationWarning` on Python 3.12. `#7302 <https://github.com/aio-libs/aiohttp/issues/7302>`\_ - Fixed `EmptyStreamReader.iter_chunks()` never ending. -- by :user:`mind1m` `#7616 <https://github.com/aio-libs/aiohttp/issues/7616>`\_ - Fixed a rare `RuntimeError: await wasn't used with future` exception. -- by :user:`stalkerg` `#7785 <https://github.com/aio-libs/aiohttp/issues/7785>`\_ - Fixed issue with insufficient HTTP method and version validation. `#7700 <https://github.com/aio-libs/aiohttp/issues/7700>`\_ - Added check to validate that absolute URIs have schemes. `#7712 <https://github.com/aio-libs/aiohttp/issues/7712>`\_ - Fixed unhandled exception when Python HTTP parser encounters unpaired Unicode surrogates. `#7715 <https://github.com/aio-libs/aiohttp/issues/7715>`\_ - Updated parser to disallow invalid characters in header field names and stop accepting LF as a request line separator. `#7719 <https://github.com/aio-libs/aiohttp/issues/7719>`\_ - Fixed Python HTTP parser not treating 204/304/1xx as an empty body. `#7755 <https://github.com/aio-libs/aiohttp/issues/7755>`\_ - Ensure empty body response for 1xx/204/304 per RFC 9112 sec 6.3. `#7756 <https://github.com/aio-libs/aiohttp/issues/7756>`\_ - Fixed an issue when a client request is closed before completing a chunked payload. -- by :user:`Dreamsorcerer` `#7764 <https://github.com/aio-libs/aiohttp/issues/7764>`\_ - Edge Case Handling for ResponseParser for missing reason value. `#7776 <https://github.com/aio-libs/aiohttp/issues/7776>`\_ - Fixed `ClientWebSocketResponse.close_code` being erroneously set to `None` when there are concurrent async tasks receiving data and closing the connection. `#7306 <https://github.com/aio-libs/aiohttp/issues/7306>`\_ - Added HTTP method validation. `#6533 <https://github.com/aio-libs/aiohttp/issues/6533>`\_ - Fixed arbitrary sequence types being allowed to inject values via version parameter. -- by :user:`Dreamsorcerer` `#7835 <https://github.com/aio-libs/aiohttp/issues/7835>`\_ - Performance: Fixed increase in latency with small messages from websocket compression changes. `#7797 <https://github.com/aio-libs/aiohttp/issues/7797>`\_ ## Improved Documentation - Fixed the `ClientResponse.release`'s type in the doc. Changed from `comethod` to `method`. `#5836 <https://github.com/aio-libs/aiohttp/issues/5836>`\_ - Added information on behavior of base_url parameter in `ClientSession`. `#6647 <https://github.com/aio-libs/aiohttp/issues/6647>`\_ - Fixed `ClientResponseError` docs. `#6700 <https://github.com/aio-libs/aiohttp/issues/6700>`\_ - Updated Redis code examples to follow the latest API. `#6907 <https://github.com/aio-libs/aiohttp/issues/6907>`\_ - Added a note about possibly needing to update headers when using `on_response_prepare`. -- by :user:`Dreamsorcerer` `#7283 <https://github.com/aio-libs/aiohttp/issues/7283>`\_ - Completed `trust_env` parameter description to honor `wss_proxy`, `ws_proxy` or `no_proxy` env. `#7325 <https://github.com/aio-libs/aiohttp/issues/7325>`\_ - Expanded SSL documentation with more examples (e.g. how to use certifi). -- by :user:`Dreamsorcerer` `#7334 <https://github.com/aio-libs/aiohttp/issues/7334>`\_ - Fix, update, and improve client exceptions documentation. `#7733 <https://github.com/aio-libs/aiohttp/issues/7733>`\_ ## Deprecations and Removals - Added `shutdown_timeout` parameter to `BaseRunner`, while deprecating `shutdown_timeout` parameter from `BaseSite`. -- by :user:`Dreamsorcerer` `#7718 <https://github.com/aio-libs/aiohttp/issues/7718>`\_ - Dropped Python 3.6 support. `#6378 <https://github.com/aio-libs/aiohttp/issues/6378>`\_ - Dropped Python 3.7 support. -- by :user:`Dreamsorcerer` `#7336 <https://github.com/aio-libs/aiohttp/issues/7336>`\_ - Removed support for abandoned `tokio` event loop. -- by :user:`Dreamsorcerer` `#7281 <https://github.com/aio-libs/aiohttp/issues/7281>`\_ ## Misc - Made `print` argument in `run_app()` optional. `#3690 <https://github.com/aio-libs/aiohttp/issues/3690>`\_ - Improved performance of `ceil_timeout` in some cases. `#6316 <https://github.com/aio-libs/aiohttp/issues/6316>`\_ - Changed importing Gunicorn to happen on-demand, decreasing import time by ~53%. -- :user:`Dreamsorcerer` `#6591 <https://github.com/aio-libs/aiohttp/issues/6591>`\_ - Improved import time by replacing `http.server` with `http.HTTPStatus`. `#6903 <https://github.com/aio-libs/aiohttp/issues/6903>`\_ - Fixed annotation of `ssl` parameter to disallow `True`. -- by :user:`Dreamsorcerer`. `#7335 <https://github.com/aio-libs/aiohttp/issues/7335>`\_ *** </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Enabled. ♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [Mend Renovate](https://www.mend.io/free-developer-tools/renovate/). View repository job log [here](https://developer.mend.io/github/allenporter/pyrainbird).  Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Zeesky-code added 2 commits September 1, 2022 15:37

Refactored code to use HTTPStatus instead of http.server

4f15d68

Refactored code to use HTTPStatus

695fb2a

Zeesky-code requested review from webknjaz and asvetlov as code owners September 1, 2022 12:50

[pre-commit.ci] auto fixes from pre-commit.com hooks

0510ac8

for more information, see https://pre-commit.ci

Dreamsorcerer reviewed Sep 1, 2022

View reviewed changes

aiohttp/web_response.py Outdated Show resolved Hide resolved

Dreamsorcerer reviewed Sep 1, 2022

View reviewed changes

aiohttp/http.py Show resolved Hide resolved

Dreamsorcerer approved these changes Sep 1, 2022

View reviewed changes

Dreamsorcerer added the backport-3.9 label Sep 1, 2022

Imports

85f5c93

Dreamsorcerer mentioned this pull request Sep 2, 2022

Slow import time (http.server) #6901

Closed

1 task

ValueError

90276f0

webknjaz assigned Dreamsorcerer and Zeesky-code Sep 22, 2022

webknjaz reviewed Sep 22, 2022

View reviewed changes

aiohttp/web_response.py Show resolved Hide resolved

Dreamsorcerer and others added 2 commits September 22, 2022 19:24

Merge branch 'master' into master

1f42a94

Added change note

7cee16a

psf-chronographer bot added the bot:chronographer:provided There is a change note present in this PR label Sep 23, 2022

pre-commit-ci bot and others added 6 commits September 23, 2022 07:43

[pre-commit.ci] auto fixes from pre-commit.com hooks

e26a6f8

for more information, see https://pre-commit.ci

Merge branch 'master' into master

cc861a6

Update test_imports.py

d3baab0

Merge branch 'master' into master

a7bc403

Update test_imports.py

c9e4549

Update test_imports.py

75bdecb

Dreamsorcerer merged commit 549e6a4 into aio-libs:master Nov 28, 2022

Dreamsorcerer added a commit that referenced this pull request Nov 28, 2022

Backport #6903 (#7104)

f81cd7f

Co-authored-by: Zainab Lawal <zainablaw1012@gmail.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor code to use HTTPStatus instead of http.server #6903

Refactor code to use HTTPStatus instead of http.server #6903

Zeesky-code commented Sep 1, 2022 •

edited by Dreamsorcerer

Loading

lgtm-com bot commented Sep 1, 2022

codecov bot commented Sep 1, 2022 •

edited

Loading

webknjaz commented Sep 22, 2022

Zeesky-code commented Sep 23, 2022

patchback bot commented Nov 28, 2022 •

edited

Loading

Refactor code to use HTTPStatus instead of http.server #6903

Refactor code to use HTTPStatus instead of http.server #6903

Conversation

Zeesky-code commented Sep 1, 2022 • edited by Dreamsorcerer Loading

What do these changes do?

lgtm-com bot commented Sep 1, 2022

codecov bot commented Sep 1, 2022 • edited Loading

Codecov Report

webknjaz commented Sep 22, 2022

Zeesky-code commented Sep 23, 2022

patchback bot commented Nov 28, 2022 • edited Loading

Backport to 3.9: 💔 cherry-picking failed — conflicts found

Backporting merged PR #6903 into master

Zeesky-code commented Sep 1, 2022 •

edited by Dreamsorcerer

Loading

codecov bot commented Sep 1, 2022 •

edited

Loading

patchback bot commented Nov 28, 2022 •

edited

Loading