Skip to content

Commit 2d8614b

Browse files
tinylambdatinylambda
committed
format code using black
1 parent 8d84bff commit 2d8614b

File tree

2,668 files changed

+23340
-22308
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,668 files changed

+23340
-22308
lines changed

‎.pre-commit-config.yaml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
repos:
2+
- repo: https://github.com/pre-commit/pre-commit-hooks
3+
rev: v4.2.0
4+
hooks:
5+
- id: check-yaml
6+
- id: requirements-txt-fixer
7+
- id: detect-private-key
8+
- id: detect-aws-credentials
9+
args: [--allow-missing-credentials]
10+
11+
- repo: https://github.com/psf/black
12+
rev: 22.3.0
13+
hooks:
14+
- id: black

‎blueprint/__init__.py‎

Lines changed: 42 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -13,48 +13,52 @@ def __new__(mcs, name: typing.AnyStr, bases: typing.Tuple, class_dict: typing.Di
1313
class_dict_copy = class_dict.copy()
1414

1515
_instance_id = Field(
16-
verbose_name='Instance ID',
17-
data_type='string',
16+
verbose_name="Instance ID",
17+
data_type="string",
1818
required=True,
1919
default=None,
2020
)
2121
_create_ts = Field(
22-
verbose_name='Creation Timestamp',
23-
data_type='int',
22+
verbose_name="Creation Timestamp",
23+
data_type="int",
2424
required=True,
2525
default=None,
2626
)
2727

28-
class_dict_copy.update({
29-
'_instance_id': _instance_id,
30-
'_create_ts': _create_ts,
31-
})
28+
class_dict_copy.update(
29+
{
30+
"_instance_id": _instance_id,
31+
"_create_ts": _create_ts,
32+
}
33+
)
3234

3335
for k, v in class_dict_copy.items():
3436
if isinstance(v, Field):
3537
v.name = k
36-
v.fullname = f'{name.lower()}.{k}'
37-
v.internal_name = f'field__{k}'
38+
v.fullname = f"{name.lower()}.{k}"
39+
v.internal_name = f"field__{k}"
3840
if v.verbose_name is None:
3941
v.verbose_name = v.name
4042

4143
meta_context: typing.Dict = {}
42-
meta_class = class_dict.get('Meta')
44+
meta_class = class_dict.get("Meta")
4345
if meta_class:
4446
assert isinstance(meta_class, type)
4547
m_dict: typing.Dict = meta_class.__dict__
4648
for mk, mv in m_dict.items():
47-
if not mk.startswith('__'):
49+
if not mk.startswith("__"):
4850
meta_context.update({mk: mv})
49-
class_dict_copy.update({'meta_context': meta_context})
51+
class_dict_copy.update({"meta_context": meta_context})
5052

5153
def _random_string(self):
52-
return ''.join(random.sample(string.ascii_letters + string.digits, 6))
53-
class_dict_copy.update({'random_string': property(_random_string)})
54+
return "".join(random.sample(string.ascii_letters + string.digits, 6))
55+
56+
class_dict_copy.update({"random_string": property(_random_string)})
5457

5558
def _config(self):
5659
pass
57-
class_dict_copy.update({'config': property(_config)})
60+
61+
class_dict_copy.update({"config": property(_config)})
5862

5963
def initialize_instance(self, init_data: typing.Dict) -> typing.NoReturn:
6064
cls_dict: typing.Dict = self.__class__.__dict__
@@ -70,10 +74,7 @@ def initialize_instance(self, init_data: typing.Dict) -> typing.NoReturn:
7074
assert isinstance(sk_v, list)
7175
if isinstance(data_type, BluePrintMeta):
7276
if issubclass(data_type, BluePrint):
73-
v_deserialized = [
74-
data_type(**d)
75-
for d in sk_v
76-
]
77+
v_deserialized = [data_type(**d) for d in sk_v]
7778
else:
7879
v_deserialized = sk_v
7980
else:
@@ -94,29 +95,33 @@ def initialize_instance(self, init_data: typing.Dict) -> typing.NoReturn:
9495
self._create_ts = int(time.time())
9596

9697
# Generate `self._instance_id` according to this format template
97-
instance_id_template = self.meta_context.get('instance_id_template')
98+
instance_id_template = self.meta_context.get("instance_id_template")
9899
if not instance_id_template:
99-
raise BluePrintInitException(msg=f'instance_id_template not configured for <{self.__class__.__name__}>')
100+
raise BluePrintInitException(
101+
msg=f"instance_id_template not configured for <{self.__class__.__name__}>"
102+
)
100103
self.instance_id_template = instance_id_template
101104

102105
# Can be saved to backend at this level ?
103-
is_top = self.meta_context.get('is_top', False)
106+
is_top = self.meta_context.get("is_top", False)
104107
self.is_top = is_top
105108

106109
# Check instance state (without _instance_id)
107110
# And build instance id render context
108111
self.instance_id_render_context = {}
109112

110113
for sk, sv in cls_dict.items():
111-
if sk == '_instance_id':
114+
if sk == "_instance_id":
112115
continue
113116

114117
if isinstance(sv, Field):
115118
sk_v = getattr(self, sk, None)
116119
self.instance_id_render_context.update({sk: sk_v})
117120
if sv.required and sv.default is None:
118121
if sk_v is None:
119-
raise BluePrintInitException(msg=f'Please specify value for {sv.fullname}')
122+
raise BluePrintInitException(
123+
msg=f"Please specify value for {sv.fullname}"
124+
)
120125

121126
self._backend = Backend() # Redis ?
122127

@@ -127,8 +132,7 @@ def init(self, **kwargs) -> typing.NoReturn:
127132
pass
128133
else:
129134
self._instance_id = self.instance_id_template.format(
130-
random_string=self.random_string,
131-
**self.instance_id_render_context
135+
random_string=self.random_string, **self.instance_id_render_context
132136
)
133137

134138
def serialize(self) -> typing.Dict:
@@ -145,7 +149,9 @@ def serialize(self) -> typing.Dict:
145149
assert isinstance(sk_v, list)
146150
if isinstance(data_type, BluePrintMeta):
147151
if issubclass(data_type, BluePrint):
148-
serialized.update({sk: [item.serialize() for item in sk_v]})
152+
serialized.update(
153+
{sk: [item.serialize() for item in sk_v]}
154+
)
149155
else:
150156
serialized.update({sk: sk_v})
151157
else:
@@ -157,11 +163,13 @@ def serialize(self) -> typing.Dict:
157163
serialized.update({sk: sk_v})
158164
return serialized
159165

160-
class_dict_copy.update({
161-
'__init__': init,
162-
'initialize_instance': initialize_instance,
163-
'serialize': serialize,
164-
})
166+
class_dict_copy.update(
167+
{
168+
"__init__": init,
169+
"initialize_instance": initialize_instance,
170+
"serialize": serialize,
171+
}
172+
)
165173

166174
cls = type.__new__(mcs, name, bases, class_dict_copy)
167175
return cls
@@ -170,5 +178,4 @@ def serialize(self) -> typing.Dict:
170178
class BluePrint(metaclass=BluePrintMeta):
171179
def save(self):
172180
assert self.is_top
173-
self._backend.set('x', 'y')
174-
181+
self._backend.set("x", "y")

‎blueprint/backend.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ def get(self, k) -> typing.Dict:
77

88
def set(self, k, v) -> typing.NoReturn:
99
pass
10-

‎blueprint/blueprints.py‎

Lines changed: 34 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,45 @@
44

55
class Character(BluePrint):
66
config_id = Field(
7-
verbose_name='Configuration ID',
8-
data_type='string',
7+
verbose_name="Configuration ID",
8+
data_type="string",
99
required=True,
1010
)
1111
level = Field(
12-
verbose_name='Level',
13-
data_type='int',
12+
verbose_name="Level",
13+
data_type="int",
1414
required=True,
1515
default=1,
1616
)
1717
star = Field(
18-
verbose_name='Star',
19-
data_type='int',
18+
verbose_name="Star",
19+
data_type="int",
2020
required=True,
2121
default=1,
2222
)
2323
exp = Field(
24-
verbose_name='Experience',
25-
data_type='int',
24+
verbose_name="Experience",
25+
data_type="int",
2626
required=True,
2727
default=0,
2828
)
2929

3030
class Meta:
31-
config_key = 'character'
32-
instance_id_template = '{config_id}_{random_string}_{_create_ts}'
31+
config_key = "character"
32+
instance_id_template = "{config_id}_{random_string}_{_create_ts}"
3333
single_instance_per_config = True # 1 config to 1 instance ?
3434
top = False
3535

3636

3737
class Item(BluePrint):
3838
config_id = Field(
39-
verbose_name='Configuration ID',
40-
data_type='string',
39+
verbose_name="Configuration ID",
40+
data_type="string",
4141
required=True,
4242
)
4343
amount = Field(
44-
verbose_name='Item amount',
45-
data_type='int',
44+
verbose_name="Item amount",
45+
data_type="int",
4646
required=True,
4747
default=0,
4848
)
@@ -54,55 +54,61 @@ class Equip(BluePrint):
5454

5555
class Role(BluePrint):
5656
server_id = Field(
57-
verbose_name='Server ID',
58-
data_type='string',
57+
verbose_name="Server ID",
58+
data_type="string",
5959
required=True,
6060
)
6161
role_id = Field(
62-
verbose_name='Role ID',
63-
data_type='string',
62+
verbose_name="Role ID",
63+
data_type="string",
6464
required=True,
6565
)
6666
characters = Field(
67-
verbose_name='Characters',
67+
verbose_name="Characters",
6868
data_type=Character,
6969
multi=True,
7070
)
7171
items = Field(
72-
verbose_name='Items',
72+
verbose_name="Items",
7373
data_type=Item,
7474
multi=True,
7575
)
7676

7777
class Meta:
78-
instance_id_template = 'role_{server_id}_{role_id}'
78+
instance_id_template = "role_{server_id}_{role_id}"
7979
single_instance_per_config = True # 1 config to 1 instance ?
8080
top = True
8181

8282
def add_character(self, character: Character):
8383
self.characters.append(character)
8484

8585

86-
if __name__ == '__main__':
86+
if __name__ == "__main__":
8787
# character = Character(config_id='20001')
8888
# character.save()
8989
# print(character.exp)
9090
# print(character.instance_id_render_context)
9191

92-
role = Role(server_id='s113', role_id='r10002', characters=[
93-
{'_instance_id': 'i1', 'level': 10, 'star': 2, 'config_id': '20001'},
94-
{'_instance_id': 'i2', 'level': 12, 'star': 2, 'config_id': '20002'},
95-
])
92+
role = Role(
93+
server_id="s113",
94+
role_id="r10002",
95+
characters=[
96+
{"_instance_id": "i1", "level": 10, "star": 2, "config_id": "20001"},
97+
{"_instance_id": "i2", "level": 12, "star": 2, "config_id": "20002"},
98+
],
99+
)
96100
print(role.instance_id_render_context)
97101
print(role.server_id)
98102
print(role.characters)
99-
character = Character(config_id='20003')
103+
character = Character(config_id="20003")
100104
role.add_character(character)
101105
print(role.characters)
102106

103107
from blueprint import BluePrintMeta
104-
print(isinstance('x', BluePrintMeta))
108+
109+
print(isinstance("x", BluePrintMeta))
105110
print(issubclass(Character, BluePrint))
106111

107112
import pprint
113+
108114
pprint.pprint(role.serialize())

‎blueprint/exceptions.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
class BluePrintException(Exception):
2-
default_msg = 'BluePrint exception happens'
2+
default_msg = "BluePrint exception happens"
33

44
def __init__(self, msg=None):
55
if msg is None:
66
msg = self.default_msg
77
self.msg = msg
88

99
def __str__(self):
10-
return f'BluePrintException<{self.msg}>'
10+
return f"BluePrintException<{self.msg}>"
1111

1212

1313
class BluePrintInitException(BluePrintException):
14-
default_msg = 'Error when initializing blueprint instance'
14+
default_msg = "Error when initializing blueprint instance"
1515

1616
def __init__(self, msg=None):
1717
super(BluePrintInitException, self).__init__(msg=msg)
@@ -22,5 +22,4 @@ def __init__(self, msg=None):
2222
super(BluePrintFieldException, self).__init__(msg=msg)
2323

2424
def __str__(self):
25-
return f'BluePrintFieldException<{self.msg}>'
26-
25+
return f"BluePrintFieldException<{self.msg}>"

‎blueprint/field.py‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
class Field:
55
def __init__(
6-
self,
7-
verbose_name: typing.AnyStr = None,
8-
data_type: typing.Any = 'string',
9-
required: bool = True,
10-
default: typing.Any = None,
11-
multi: bool = False,
6+
self,
7+
verbose_name: typing.AnyStr = None,
8+
data_type: typing.Any = "string",
9+
required: bool = True,
10+
default: typing.Any = None,
11+
multi: bool = False,
1212
):
1313
self.name = None
1414
self.fullname = None
@@ -28,4 +28,3 @@ def __get__(self, instance, owner):
2828

2929
def __set__(self, instance, value):
3030
setattr(instance, self.internal_name, value)
31-

‎books/atbswp/ch13/ch13_1_1.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import PyPDF3
22

3-
if __name__ == '__main__':
4-
pdf_file = '/home/felix/Downloads/The Definitive Guide to Masonite.pdf'
5-
pdf_file_obj = open(pdf_file, 'rb')
3+
if __name__ == "__main__":
4+
pdf_file = "/home/felix/Downloads/The Definitive Guide to Masonite.pdf"
5+
pdf_file_obj = open(pdf_file, "rb")
66
pdf_reader = PyPDF3.PdfFileReader(pdf_file_obj)
77
print(pdf_reader.getNumPages())
88

0 commit comments

Comments
 (0)