Skip to content

corekit: narrow interface fields' post_process return type via isinstance #479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JarryShaw merged 2 commits into from
Sep 18, 2026
Merged

corekit: narrow interface fields' post_process return type via isinstance #479

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fde0337
corekit: narrow the interface fields' post_process return type via is…
JarryShaw Sep 18, 2026
76ef3e7
Merge branch 'main' into fix-473-interface-post-process-types
JarryShaw Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions pcapkit/corekit/fields/ipaddress.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,9 +242,10 @@ def pre_process(self, value: 'IPv4Interface | bytes | int | str', packet: 'dict[
val = value
else:
with _reraise_as_field_value_error('invalid IP interface'):
val = ipaddress.ip_interface(value) # type: ignore[assignment]
if val.version != self.version:
raise FieldValueError(f'IP version mismatch: {val.version} != {self.version}')
parsed = ipaddress.ip_interface(value)
if not isinstance(parsed, ipaddress.IPv4Interface):
raise FieldValueError(f'IP version mismatch: {parsed.version} != {self.version}')
val = parsed

ip = val.ip
mask = val.netmask
Expand Down Expand Up @@ -281,7 +282,7 @@ def post_process(self, value: 'bytes', packet: 'dict[str, Any]') -> 'IPv4Interfa

with _reraise_as_field_value_error('invalid IPv4 interface'):
val = ipaddress.ip_interface(f'{ip}/{mask}')
if val.version != self.version:
if not isinstance(val, ipaddress.IPv4Interface):
raise FieldValueError(f'IP version mismatch: {val.version} != {self.version}')
return val

Expand Down Expand Up @@ -326,9 +327,10 @@ def pre_process(self, value: 'IPv6Interface | bytes | int | str', packet: 'dict[
val = value
else:
with _reraise_as_field_value_error('invalid IP interface'):
val = ipaddress.ip_interface(value) # type: ignore[assignment]
if val.version != self.version:
raise FieldValueError(f'IP version mismatch: {val.version} != {self.version}')
parsed = ipaddress.ip_interface(value)
if not isinstance(parsed, ipaddress.IPv6Interface):
raise FieldValueError(f'IP version mismatch: {parsed.version} != {self.version}')
val = parsed

ip = val.ip
prefixlen = cast('int', val._prefixlen) # type: ignore[attr-defined] # pylint: disable=protected-access
Expand Down Expand Up @@ -372,6 +374,6 @@ def post_process(self, value: 'bytes', packet: 'dict[str, Any]') -> 'IPv6Interfa

with _reraise_as_field_value_error('invalid IPv6 interface'):
val = ipaddress.ip_interface(f'{ip}/{prefixlen}')
if val.version != self.version:
if not isinstance(val, ipaddress.IPv6Interface):
raise FieldValueError(f'IP version mismatch: {val.version} != {self.version}')
return val
Loading