Skip to content

Commit ade1e50

Browse files
authored
Merge pull request #20 from mwarzybok-sumoheavy/feature/SP-523
SP-523 Implement Black
2 parents 45e53d3 + 28c998c commit ade1e50

File tree

10 files changed

+21
-16
lines changed

10 files changed

+21
-16
lines changed

requirements-dev.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-r requirements.txt
2+
black==23.3.0

requirements.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
ecdsa==0.17.0
2-
requests==2.27.1
3-
1+
ecdsa==0.18.0
2+
requests==2.28.2

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
name="bitpay",
88
package_dir={"": "src"},
99
packages=setuptools.find_packages(where="src"),
10-
version="3.4.2203",
10+
version="4.0.0",
1111
description="Accept bitcoin with BitPay",
1212
author="Antonio Buedo",
1313
author_email="[email protected]",

src/bitpay/client.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -464,7 +464,9 @@ def pay_invoice(self, invoice_id: str, complete: bool = True) -> Invoice:
464464
"token": self.get_access_token(Facade.Merchant),
465465
"complete": complete,
466466
}
467-
response_json = self.__restcli.update("invoices/pay/%s" % invoice_id, params)
467+
response_json = self.__restcli.update(
468+
"invoices/pay/%s" % invoice_id, params
469+
)
468470
except BitPayException as exe:
469471
raise InvoicePaymentException(
470472
"failed to serialize Invoice object : %s" % str(exe), exe.get_api_code()

src/bitpay/models/invoice/miner_fees.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class MinerFees:
2424
__xrp = MinerFeesItem()
2525

2626
def __init__(self, **kwargs):
27-
2827
for key, value in kwargs.items():
2928
try:
3029
if key in ["BTC", "BCH", "ETH", "USDC", "GUSD", "PAX", "BUSD", "XRP"]:

src/bitpay/models/payout/payout_batch.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ def __init__(
5656
for key, value in kwargs.items():
5757
try:
5858
if key in ["instructions"]:
59-
6059
klass = (
6160
PayoutInstruction
6261
if key == "instructions"

src/bitpay/models/settlement/settlement.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ class Settlement:
3636
def __init__(self, **kwargs):
3737
for key, value in kwargs.items():
3838
try:
39-
4039
if key in ["withHoldings", "ledgerEntries", "payoutInfo"]:
4140
klass = (
4241
SettlementLedgerEntry

src/bitpay/models/wallet/currencies.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,11 @@ def __init__(self, **kwargs):
2323
for key, value in kwargs.items():
2424
try:
2525
if key in ["qr"]:
26-
klass = CurrencyQr if key == "qr" else globals()[key[0].upper() + key[1:]]
26+
klass = (
27+
CurrencyQr
28+
if key == "qr"
29+
else globals()[key[0].upper() + key[1:]]
30+
)
2731
value = klass(**value)
2832
getattr(
2933
self, "set_%s" % key_utils.change_camel_case_to_snake_case(key)

src/bitpay/models/wallet/wallet.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def __init__(self, **kwargs):
1717
for key, value in kwargs.items():
1818
try:
1919
if key in ["currencies"]:
20-
2120
klass = globals()[key[0].upper() + key[1:]]
2221

2322
if isinstance(value, list):

src/bitpay/utils/rest_cli.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def init(self):
3131
"x-bitpay-api-frame": env.BITPAYAPIFRAME,
3232
"x-bitpay-api-frame-version": env.BITPAYAPIFRAMEVERSION,
3333
"content-type": "application/json",
34-
"X-accept-version": "2.0.0"
34+
"X-accept-version": "2.0.0",
3535
}
3636
if self.__proxy != "":
3737
self.__headers["proxy"] = self.__proxy
@@ -51,7 +51,9 @@ def post(self, uri, form_data, signature_required=True):
5151
form_data = json.dumps(form_data)
5252
if signature_required:
5353
self.__headers["x-signature"] = sign(full_url + form_data, self.__eckey)
54-
self.__headers["x-identity"] = get_compressed_public_key_from_pem(self.__eckey)
54+
self.__headers["x-identity"] = get_compressed_public_key_from_pem(
55+
self.__eckey
56+
)
5557

5658
response = requests.post(full_url, data=form_data, headers=self.__headers)
5759
json_response = self.response_to_json_string(response)
@@ -71,7 +73,9 @@ def get(self, uri, parameters=None, signature_required=True):
7173

7274
if signature_required:
7375
self.__headers["x-signature"] = sign(full_url, self.__eckey)
74-
self.__headers["x-identity"] = get_compressed_public_key_from_pem(self.__eckey)
76+
self.__headers["x-identity"] = get_compressed_public_key_from_pem(
77+
self.__eckey
78+
)
7579

7680
response = requests.get(full_url, headers=self.__headers)
7781
json_response = self.response_to_json_string(response)
@@ -124,9 +128,7 @@ def response_to_json_string(self, response):
124128
)
125129

126130
if "error" in response_obj:
127-
raise BitPayException(
128-
"Error: " + response_obj["error"]
129-
)
131+
raise BitPayException("Error: " + response_obj["error"])
130132
elif "errors" in response_obj:
131133
message = ""
132134
for error in response_obj["errors"]:

0 commit comments

Comments
 (0)