Skip to content

Commit 71645ff

Browse files
cmccandlessBethanyG
authored andcommitted
remove single-letter variable names
1 parent 4e2aa32 commit 71645ff

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

bin/data.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,38 +10,38 @@
1010

1111
def _custom_dataclass_init(self, *args, **kwargs):
1212
# print(self.__class__.__name__, "__init__")
13-
names = [f.name for f in fields(self)]
13+
names = [field.name for field in fields(self)]
1414
used_names = set()
1515

1616
# Handle positional arguments
17-
for v in args:
17+
for value in args:
1818
try:
19-
k = names.pop(0)
19+
name = names.pop(0)
2020
except IndexError:
2121
raise TypeError(f"__init__() given too many positional arguments")
2222
# print(f'setting {k}={v}')
23-
setattr(self, k, v)
24-
used_names.add(k)
23+
setattr(self, name, value)
24+
used_names.add(name)
2525

2626
# Handle keyword arguments
27-
for k, v in kwargs.items():
28-
if k in names:
27+
for name, value in kwargs.items():
28+
if name in names:
2929
# print(f'setting {k}={v}')
30-
setattr(self, k, v)
31-
used_names.add(k)
32-
elif k in used_names:
33-
raise TypeError(f"__init__() got multiple values for argument '{k}'")
30+
setattr(self, name, value)
31+
used_names.add(name)
32+
elif name in used_names:
33+
raise TypeError(f"__init__() got multiple values for argument '{name}'")
3434
else:
3535
raise TypeError(
36-
f"Unrecognized field '{k}' for dataclass {self.__class__.__name__}."
36+
f"Unrecognized field '{name}' for dataclass {self.__class__.__name__}."
3737
"\nIf this field is valid, please add it to the dataclass in data.py."
3838
"\nIf adding an object-type field, please create a new dataclass for it."
3939
)
4040

4141
# Check for missing positional arguments
4242
missing = [
43-
f"'{f.name}'" for f in fields(self)
44-
if isinstance(f.default, dataclasses._MISSING_TYPE) and f.name not in used_names
43+
f"'{field.name}'" for field in fields(self)
44+
if isinstance(field.default, dataclasses._MISSING_TYPE) and field.name not in used_names
4545
]
4646
if len(missing) == 1:
4747
raise TypeError(f"__init__() missing 1 required positional argument: {missing[0]}")
@@ -321,8 +321,8 @@ def load(cls, path="config.json"):
321321
except IOError:
322322
print(f"FAIL: {path} file not found")
323323
raise SystemExit(1)
324-
except TypeError as e:
325-
print(f"FAIL: {e}")
324+
except TypeError as ex:
325+
print(f"FAIL: {ex}")
326326
raise SystemExit(1)
327327

328328

0 commit comments

Comments
 (0)