Skip to content

Commit 69f49ee

Browse files
authored
Add black to the auto directory (#2514)
* Add black to the auto directory * Add newsfragment
1 parent 39f4453 commit 69f49ee

File tree

3 files changed

+18
-16
lines changed

3 files changed

+18
-16
lines changed

newsfragments/2514.misc.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Add black checks to ``web3/auto``

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ basepython=python
6464
extras=linter
6565
commands=
6666
flake8 {toxinidir}/web3 {toxinidir}/ens {toxinidir}/ethpm {toxinidir}/tests --exclude {toxinidir}/ethpm/ethpm-spec
67-
black {toxinidir}/ethpm {toxinidir}/web3/utils --exclude {toxinidir}/ethpm/ethpm-spec --check
67+
black {toxinidir}/ethpm {toxinidir}/web3/auto {toxinidir}/web3/utils --exclude {toxinidir}/ethpm/ethpm-spec --check
6868
isort --recursive --check-only --diff {toxinidir}/web3/ {toxinidir}/ens/ {toxinidir}/ethpm/ {toxinidir}/tests/
6969
mypy -p web3 -p ethpm -p ens --config-file {toxinidir}/mypy.ini
7070

web3/auto/infura/endpoints.py

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@
1616
InfuraKeyNotFound,
1717
)
1818

19-
INFURA_MAINNET_DOMAIN = 'mainnet.infura.io'
20-
INFURA_ROPSTEN_DOMAIN = 'ropsten.infura.io'
21-
INFURA_GOERLI_DOMAIN = 'goerli.infura.io'
22-
INFURA_RINKEBY_DOMAIN = 'rinkeby.infura.io'
23-
INFURA_KOVAN_DOMAIN = 'kovan.infura.io'
19+
INFURA_MAINNET_DOMAIN = "mainnet.infura.io"
20+
INFURA_ROPSTEN_DOMAIN = "ropsten.infura.io"
21+
INFURA_GOERLI_DOMAIN = "goerli.infura.io"
22+
INFURA_RINKEBY_DOMAIN = "rinkeby.infura.io"
23+
INFURA_KOVAN_DOMAIN = "kovan.infura.io"
2424

25-
WEBSOCKET_SCHEME = 'wss'
26-
HTTP_SCHEME = 'https'
25+
WEBSOCKET_SCHEME = "wss"
26+
HTTP_SCHEME = "https"
2727

2828

2929
def load_api_key() -> str:
3030
# in web3py v6 remove outdated WEB3_INFURA_API_KEY
31-
key = os.environ.get('WEB3_INFURA_PROJECT_ID',
32-
os.environ.get('WEB3_INFURA_API_KEY', ''))
33-
if key == '':
31+
key = os.environ.get(
32+
"WEB3_INFURA_PROJECT_ID", os.environ.get("WEB3_INFURA_API_KEY", "")
33+
)
34+
if key == "":
3435
raise InfuraKeyNotFound(
3536
"No Infura Project ID found. Please ensure "
3637
"that the environment variable WEB3_INFURA_PROJECT_ID is set."
@@ -39,25 +40,25 @@ def load_api_key() -> str:
3940

4041

4142
def load_secret() -> str:
42-
return os.environ.get('WEB3_INFURA_API_SECRET', '')
43+
return os.environ.get("WEB3_INFURA_API_SECRET", "")
4344

4445

4546
def build_http_headers() -> Optional[Dict[str, Tuple[str, str]]]:
4647
secret = load_secret()
4748
if secret:
48-
headers = {'auth': ('', secret)}
49+
headers = {"auth": ("", secret)}
4950
return headers
5051
return None
5152

5253

5354
def build_infura_url(domain: str) -> URI:
54-
scheme = os.environ.get('WEB3_INFURA_SCHEME', WEBSOCKET_SCHEME)
55+
scheme = os.environ.get("WEB3_INFURA_SCHEME", WEBSOCKET_SCHEME)
5556
key = load_api_key()
5657
secret = load_secret()
5758

58-
if scheme == WEBSOCKET_SCHEME and secret != '':
59+
if scheme == WEBSOCKET_SCHEME and secret != "":
5960
return URI(f"{scheme}://:{secret}@{domain}/ws/v3/{key}")
60-
elif scheme == WEBSOCKET_SCHEME and secret == '':
61+
elif scheme == WEBSOCKET_SCHEME and secret == "":
6162
return URI(f"{scheme}://{domain}/ws/v3/{key}")
6263
elif scheme == HTTP_SCHEME:
6364
return URI(f"{scheme}://{domain}/v3/{key}")

0 commit comments

Comments
 (0)