Skip to content

Commit 2e61ec1

Browse files
committed
requests.help static typing improvements
1 parent 6f205ff commit 2e61ec1

1 file changed

Lines changed: 26 additions & 19 deletions

File tree

src/requests/help.py

Lines changed: 26 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,39 @@
44
import platform
55
import ssl
66
import sys
7-
from typing import Any
7+
from typing import TYPE_CHECKING, Any
88

99
import idna
1010
import urllib3
1111

1212
from . import __version__ as requests_version
1313

14-
try:
15-
import charset_normalizer
16-
except ImportError:
17-
charset_normalizer = None
18-
19-
try:
14+
if TYPE_CHECKING:
2015
import chardet
21-
except ImportError:
22-
chardet = None
23-
24-
try:
25-
from urllib3.contrib import pyopenssl
26-
except ImportError:
27-
pyopenssl = None
28-
OpenSSL = None
29-
cryptography = None
30-
else:
16+
import charset_normalizer
3117
import cryptography
3218
import OpenSSL
19+
from urllib3.contrib import pyopenssl
20+
else:
21+
try:
22+
import charset_normalizer
23+
except ImportError:
24+
charset_normalizer = None
25+
26+
try:
27+
import chardet
28+
except ImportError:
29+
chardet = None
30+
31+
try:
32+
from urllib3.contrib import pyopenssl
33+
except ImportError:
34+
pyopenssl = None
35+
OpenSSL = None
36+
cryptography = None
37+
else:
38+
import cryptography
39+
import OpenSSL
3340

3441

3542
def _implementation():
@@ -79,7 +86,7 @@ def info() -> dict[str, Any]:
7986

8087
implementation_info = _implementation()
8188
urllib3_info = {"version": urllib3.__version__}
82-
charset_normalizer_info = {"version": None}
89+
charset_normalizer_info: dict[str, str | None] = {"version": None}
8390
chardet_info: dict[str, str | None] = {"version": None}
8491
if charset_normalizer:
8592
charset_normalizer_info = {"version": charset_normalizer.__version__}
@@ -123,7 +130,7 @@ def info() -> dict[str, Any]:
123130
}
124131

125132

126-
def main():
133+
def main() -> None:
127134
"""Pretty-print the bug information as JSON."""
128135
print(json.dumps(info(), sort_keys=True, indent=2))
129136

0 commit comments

Comments
 (0)