Use correct style for re-exported imports (for 3.5 branch)

[AMDmi3]

What do these changes do?

Use correct style for re-exported imports, makes mypy --strict happy.

Are there changes in behavior for the user?

No

Related issue number

#3868

Checklist

• I think the code is well written
• Unit tests for the changes exist (no new code and functional changes though, so should be covered by existing tests)
• Documentation reflects the changes
• If you provide code modification, please add yourself to CONTRIBUTORS.txt
• Add a new news fragment into the CHANGES folder

[AMDmi3]

Please give me some more time, I was not aware from foo import (bar as baz) syntax is possible. Will redo the patches that way, that will also fix flake8.

[lgtm-com]

This pull request introduces 3 alerts and fixes 3 when merging 02c65fe into a3fe4ec - view on LGTM.com

new alerts:

• 3 for Module-level cyclic import

fixed alerts:

• 3 for Module-level cyclic import

[lgtm-com]

This pull request introduces 22 alerts and fixes 22 when merging 879a5d4 into a3fe4ec - view on LGTM.com

new alerts:

• 22 for Module-level cyclic import

fixed alerts:

• 22 for Module-level cyclic import

[codecov-io]

Codecov Report

Merging #3873 into 3.5 will increase coverage by 0.1%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##              3.5    #3873     +/-   ##
=========================================
+ Coverage   97.86%   97.97%   +0.1%     
=========================================
  Files          44       44             
  Lines        8579     8770    +191     
  Branches     1380     1381      +1     
=========================================
+ Hits         8396     8592    +196     
+ Misses         78       72      -6     
- Partials      105      106      +1

Impacted Files	Coverage Δ
aiohttp/__init__.py	100% <100%> (ø)	⬆️
aiohttp/web.py	99.51% <100%> (+0.41%)	⬆️
aiohttp/http.py	100% <100%> (ø)	⬆️
aiohttp/streams.py	98.2% <0%> (+0.26%)	⬆️
aiohttp/helpers.py	96.74% <0%> (+0.5%)	⬆️
aiohttp/locks.py	100% <0%> (+7.14%)	⬆️

---

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a3fe4ec...879a5d4. Read the comment docs.

[asvetlov]

Please fix merge conflicts

[AMDmi3]

Updated