Use correct style for re-exported imports

[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 e97120b into ac81c18 - view on LGTM.com

new alerts:

• 3 for Module-level cyclic import

fixed alerts:

• 3 for Module-level cyclic import

[AMDmi3]

Done. I'm not sure how to fix isort though - for me it (the same version, 4.3.21) produces a huge diff all over the module.

[webknjaz]

You should probably do whatever isort tells you to.

[lgtm-com]

This pull request introduces 23 alerts and fixes 23 when merging bf9870c into 5c208cd - view on LGTM.com

new alerts:

• 23 for Module-level cyclic import

fixed alerts:

• 23 for Module-level cyclic import

[lgtm-com]

This pull request introduces 23 alerts and fixes 23 when merging 249163b into 5c208cd - view on LGTM.com

new alerts:

• 23 for Module-level cyclic import

fixed alerts:

• 23 for Module-level cyclic import

[codecov-io]

Codecov Report

Merging #3872 into master will not change coverage.
The diff coverage is n/a.

@@           Coverage Diff           @@
##           master    #3872   +/-   ##
=======================================
  Coverage   97.96%   97.96%           
=======================================
  Files          43       43           
  Lines        8590     8590           
  Branches     1373     1373           
=======================================
  Hits         8415     8415           
  Misses         71       71           
  Partials      104      104

---

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 5c208cd...249163b. Read the comment docs.

[asvetlov]

I very sorry, your PR has conflicts after merging #3632

Could you please fix these conflicts?

[AMDmi3]

Updated

[asvetlov]

Thanks!