Skip to content

Commit 5721087

Browse files
andreax79andreax79
committed
black code style
1 parent 634d6f1 commit 5721087

8 files changed

Lines changed: 182 additions & 213 deletions

File tree

‎securid/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
from .token import Token
44

5-
__version__ = '0.9.5'
5+
__version__ = "0.9.5"
66

7-
__all__ = ['Token']
7+
__all__ = ["Token"]

‎securid/cli.py‎

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
#!/usr/bin/env python
22

3+
import argparse
34
import os
45
import sys
56
import time
67
from datetime import datetime
7-
import argparse
8-
from typing import Optional, List, NoReturn
9-
from .token import AbstractTokenFile, Token
10-
from .stoken import StokenFile, DEFAULT_STOKEN_FILENAME
11-
from .sdtid import SdtidFile
8+
from typing import List, NoReturn, Optional
9+
10+
from .exceptions import InvalidSignature, ParseException
1211
from .jsontoken import JSONTokenFile
13-
from .exceptions import ParseException, InvalidSignature
12+
from .sdtid import SdtidFile
13+
from .stoken import DEFAULT_STOKEN_FILENAME, StokenFile
14+
from .token import AbstractTokenFile, Token
1415

15-
__all__ = ['show_token', 'export', 'interactive', 'show_version', 'main']
16+
__all__ = ["show_token", "export", "interactive", "show_version", "main"]
1617

1718
EXIT_SUCCESS = 0
1819
EXIT_FAILURE = 1
@@ -24,7 +25,7 @@ def show_token(token: Token, pin: Optional[int] = None, verbose: bool = False) -
2425
if verbose:
2526
for_time = datetime.utcnow()
2627
print(token)
27-
print('{} {:2}s'.format(token.at(for_time, pin=pin), token.time_left(for_time)))
28+
print("{} {:2}s".format(token.at(for_time, pin=pin), token.time_left(for_time)))
2829
else:
2930
print(token.now(pin=pin))
3031
return EXIT_SUCCESS
@@ -34,7 +35,7 @@ def export(token: Token) -> int:
3435
"Export token into JSON"
3536
f = JSONTokenFile(token=token)
3637
sys.stdout.buffer.write(f.export_token())
37-
sys.stdout.buffer.write(b'\n')
38+
sys.stdout.buffer.write(b"\n")
3839
return EXIT_SUCCESS
3940

4041

@@ -44,8 +45,8 @@ def interactive(token: Token, test: bool = False, pin: Optional[int] = None) ->
4445
while True:
4546
for_time = datetime.utcnow()
4647
left = token.time_left(for_time)
47-
bar = ('#' * left) + ('.' * (token.interval - left))
48-
print('{} {:2}s [{}]'.format(token.at(for_time, pin=pin), left, bar))
48+
bar = ("#" * left) + ("." * (token.interval - left))
49+
print("{} {:2}s [{}]".format(token.at(for_time, pin=pin), left, bar))
4950
if test:
5051
raise KeyboardInterrupt
5152
time.sleep(1)
@@ -78,33 +79,29 @@ def main(args: Optional[List[str]] = None) -> int:
7879
prog = os.path.basename(sys.argv[0])
7980
parser = ArgumentParser()
8081
parser.add_argument(
81-
'-f',
82-
'--filename',
82+
"-f",
83+
"--filename",
8384
help="token file (sdtid, stokenrc or json)",
84-
dest='filename',
85+
dest="filename",
8586
default=DEFAULT_STOKEN_FILENAME,
8687
)
87-
parser.add_argument('--password', dest='password')
88-
parser.add_argument('--pin', type=int, dest='pin')
89-
parser.add_argument(
90-
'--export', help="export token into JSON", action='store_true', dest='export'
91-
)
88+
parser.add_argument("--password", dest="password")
89+
parser.add_argument("--pin", type=int, dest="pin")
90+
parser.add_argument("--export", help="export token into JSON", action="store_true", dest="export")
9291
parser.add_argument(
93-
'-i',
94-
'--interactive',
92+
"-i",
93+
"--interactive",
9594
help="show the code every second until interrupted",
96-
action='store_true',
97-
dest='interactive',
98-
)
99-
parser.add_argument(
100-
'-v', '--verbose', help="verbose output", action='store_true', dest='verbose'
95+
action="store_true",
96+
dest="interactive",
10197
)
98+
parser.add_argument("-v", "--verbose", help="verbose output", action="store_true", dest="verbose")
10299
parser.add_argument(
103-
'-V',
104-
'--version',
100+
"-V",
101+
"--version",
105102
help="show version and exit",
106-
action='store_true',
107-
dest='version',
103+
action="store_true",
104+
dest="version",
108105
)
109106
try:
110107
cli_args = parser.parse_args(args=args)

‎securid/exceptions.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/usr/bin/env python
22

33
__all__ = [
4-
'ParseException',
5-
'InvalidToken',
6-
'InvalidSignature',
7-
'InvalidSeed',
8-
'InvalidSerial',
4+
"ParseException",
5+
"InvalidToken",
6+
"InvalidSignature",
7+
"InvalidSeed",
8+
"InvalidSerial",
99
]
1010

1111

‎securid/jsontoken.py‎

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
#!/usr/bin/env python
22

3+
import json
34
import os
45
import os.path
5-
import json
66
from typing import Any, Dict, Optional, Union
7+
8+
from .exceptions import InvalidSeed, InvalidSerial, ParseException
9+
from .token import SERIAL_LENGTH, AbstractTokenFile, Token
710
from .utils import Bytes, fromisoformat
8-
from .token import SERIAL_LENGTH, Token, AbstractTokenFile
9-
from .exceptions import ParseException, InvalidSeed, InvalidSerial
1011

1112
__all__ = [
12-
'JSONTokenFile',
13+
"JSONTokenFile",
1314
]
1415

1516

@@ -52,7 +53,7 @@ def __init__(
5253
self.token = token
5354
elif data is not None:
5455
if isinstance(data, str):
55-
data = bytes(data, 'ascii')
56+
data = bytes(data, "ascii")
5657
self.filename = None
5758
self.token = self.json_decode_token(data)
5859
elif filename is not None:
@@ -67,7 +68,7 @@ def parse_file(cls, filename: str) -> bytes:
6768
6869
:param filename: JSON file path
6970
"""
70-
with open(filename, 'rb') as f:
71+
with open(filename, "rb") as f:
7172
return f.read()
7273

7374
@classmethod
@@ -78,16 +79,14 @@ def json_decode_token(cls, data: Union[Bytes, Dict[str, Any]]) -> Token:
7879
else:
7980
dct = json.loads(data)
8081
token = Token(
81-
digits=dct['digits'],
82-
interval=dct['period'],
83-
exp_date=fromisoformat(dct['exp_date'])
84-
if dct.get('exp_date')
85-
else None,
86-
seed=bytes(dct['secret']),
87-
serial=dct['serial'],
88-
issuer=dct.get('issuerInt'),
89-
label=dct.get('label'),
90-
pin=dct.get('pin'),
82+
digits=dct["digits"],
83+
interval=dct["period"],
84+
exp_date=fromisoformat(dct["exp_date"]) if dct.get("exp_date") else None,
85+
seed=bytes(dct["secret"]),
86+
serial=dct["serial"],
87+
issuer=dct.get("issuerInt"),
88+
label=dct.get("label"),
89+
pin=dct.get("pin"),
9190
)
9291
return token
9392
except json.decoder.JSONDecodeError as ex:
@@ -106,24 +105,24 @@ def export_token(self) -> bytes:
106105
Export token as JSON
107106
"""
108107
if not self.token.seed:
109-
raise InvalidSeed('Missing seed')
108+
raise InvalidSeed("Missing seed")
110109
if not self.token.serial:
111-
raise InvalidSerial('Missing serial')
110+
raise InvalidSerial("Missing serial")
112111
if len(self.token.serial) != SERIAL_LENGTH:
113-
raise InvalidSerial('Serial length != {}'.format(SERIAL_LENGTH))
112+
raise InvalidSerial("Serial length != {}".format(SERIAL_LENGTH))
114113
data = {
115-
'digits': self.token.digits,
116-
'period': self.token.interval,
117-
'exp_date': self.token.exp_date.isoformat() if self.token.exp_date else '',
118-
'secret': [x for x in self.token.seed],
119-
'serial': self.token.serial,
120-
'type': 'SecurID',
114+
"digits": self.token.digits,
115+
"period": self.token.interval,
116+
"exp_date": self.token.exp_date.isoformat() if self.token.exp_date else "",
117+
"secret": [x for x in self.token.seed],
118+
"serial": self.token.serial,
119+
"type": "SecurID",
121120
}
122121
if self.token.issuer is not None:
123-
data['issuerInt'] = self.token.issuer
122+
data["issuerInt"] = self.token.issuer
124123
if self.token.label is not None:
125-
data['label'] = self.token.label
124+
data["label"] = self.token.label
126125
if self.token.pin is not None:
127-
data['pin'] = self.token.pin
126+
data["pin"] = self.token.pin
128127
j = json.dumps(data, sort_keys=True)
129-
return bytes(j, 'ascii')
128+
return bytes(j, "ascii")

0 commit comments

Comments
 (0)