Skip to content

Commit d2ba3d7

Browse files
committed
Fix linting errors
1 parent 42e7285 commit d2ba3d7

File tree

4 files changed

+15
-10
lines changed

4 files changed

+15
-10
lines changed

Diff for: src/cattr/converters.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,11 @@ def _structure_default(self, obj, cl):
298298
return obj
299299

300300
if is_generic(cl):
301-
fn = make_dict_structure_fn(cl, self, _cattrs_prefer_attrib_converters=self._prefer_attrib_converters)
301+
fn = make_dict_structure_fn(
302+
cl,
303+
self,
304+
_cattrs_prefer_attrib_converters=self._prefer_attrib_converters,
305+
)
302306
self.register_structure_hook(cl, fn)
303307
return fn(obj)
304308

Diff for: src/cattr/gen.py

+7-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
import re
44
import uuid
55
from dataclasses import is_dataclass
6-
from typing import Any, Optional, Type, TypeVar
6+
from typing import Any, Optional, TYPE_CHECKING, Type, TypeVar
77

88
import attr
99
from attr import NOTHING, resolve_types
1010

1111
from ._compat import adapted_fields, get_args, get_origin, is_bare, is_generic
1212
from .errors import StructureHandlerNotFoundError
1313

14+
if TYPE_CHECKING:
15+
from cattr.converters import Converter
16+
1417

1518
@attr.s(slots=True, frozen=True)
1619
class AttributeOverride(object):
@@ -132,7 +135,7 @@ def generate_mapping(cl: Type, old_mapping):
132135

133136
def make_dict_structure_fn(
134137
cl: Type,
135-
converter,
138+
converter: "Converter",
136139
_cattrs_forbid_extra_keys: bool = False,
137140
_cattrs_use_linecache: bool = True,
138141
_cattrs_prefer_attrib_converters: bool = False,
@@ -212,19 +215,15 @@ def make_dict_structure_fn(
212215
f" '{ian}': {struct_handler_name}(o['{kn}'], type_{an}),"
213216
)
214217
else:
215-
lines.append(
216-
f" '{ian}': o['{kn}'],"
217-
)
218+
lines.append(f" '{ian}': o['{kn}'],")
218219
else:
219220
post_lines.append(f" if '{kn}' in o:")
220221
if handler:
221222
post_lines.append(
222223
f" res['{ian}'] = {struct_handler_name}(o['{kn}'], type_{an})"
223224
)
224225
else:
225-
post_lines.append(
226-
f" res['{ian}'] = o['{kn}']"
227-
)
226+
post_lines.append(f" res['{ian}'] = o['{kn}']")
228227

229228
lines.append(" }")
230229
if _cattrs_forbid_extra_keys:

Diff for: tests/test_generics.py

+1
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ def test_raises_if_no_generic_params_supplied(converter):
8787

8888
assert exc.value.type_ is T
8989

90+
9091
def test_unstructure_generic_attrs():
9192
c = GenConverter()
9293

Diff for: tests/test_structure.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ class Bar(object):
315315

316316
assert exc.value.type_ is Bar
317317

318+
318319
@given(data(), enums_of_primitives())
319320
def test_structuring_enums(data, enum):
320321
"""Test structuring enums by their values."""
@@ -331,7 +332,7 @@ def test_structuring_unsupported():
331332
converter.structure(1, Converter)
332333

333334
assert exc.value.type_ is Converter
334-
335+
335336
with raises(StructureHandlerNotFoundError) as exc:
336337
converter.structure(1, Union[int, str])
337338

0 commit comments

Comments
 (0)