Skip to content

Commit d13ff17

Browse files
committed
bugfix for circular imports in PCAPNG protocol
1 parent f618b52 commit d13ff17

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

pcapkit/protocols/misc/pcapng.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import time
2626
from typing import TYPE_CHECKING, cast, overload
2727

28-
from pcapkit import __version__
2928
from pcapkit.const.pcapng.block_type import BlockType as Enum_BlockType
3029
from pcapkit.const.pcapng.filter_type import FilterType as Enum_FilterType
3130
from pcapkit.const.pcapng.hash_algorithm import HashAlgorithm as Enum_HashAlgorithm
@@ -4303,13 +4302,15 @@ def _make_secrets_tls(self, type: 'Enum_SecretsType', secrets: 'Optional[Data_TL
43034302
Constructed secrets schema.
43044303
43054304
"""
4305+
from pcapkit import __version__
4306+
43064307
if secrets is not None:
43074308
entries = secrets.entries
43084309

43094310
if entries is None:
43104311
entries = {}
43114312

4312-
data = [f'# generated by PyPCAPKit version {__version__}{os.sep}'] # type: list[str]
4313+
data = [f'# generated by PyPCAPKit v{__version__} at {datetime.datetime.now().isoformat()}{os.sep}'] # type: list[str]
43134314
for label, entry in entries.items():
43144315
for k, v in entry.items(multi=True):
43154316
data.append(f'{label.name} {k.hex()} {v.hex()}{os.sep}')
@@ -4333,13 +4334,15 @@ def _make_secrets_wireguard(self, type: 'Enum_SecretsType', secrets: 'Optional[D
43334334
Constructed secrets schema.
43344335
43354336
"""
4337+
from pcapkit import __version__
4338+
43364339
if secrets is not None:
43374340
entries = secrets.entries
43384341

43394342
if entries is None:
43404343
entries = OrderedMultiDict()
43414344

4342-
data = [f'# generated by PyPCAPKit version {__version__}{os.sep}'] # type: list[str]
4345+
data = [f'# generated by PyPCAPKit v{__version__} at {datetime.datetime.now().isoformat()}{os.sep}'] # type: list[str]
43434346
for label, value in entries:
43444347
data.append(f'{label} = {value}{os.sep}')
43454348

0 commit comments

Comments
 (0)