Skip to content

Commit a2fd7fe

Browse files
committed
revised const/vendor for _missing_ & type hints
1 parent f8958ab commit a2fd7fe

File tree

179 files changed

+686
-838
lines changed

Some content is hidden

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

179 files changed

+686
-838
lines changed

.vscode/settings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@
128128
"httpv",
129129
"htype",
130130
"hwty",
131+
"Iaddr",
131132
"iden",
132133
"idnm",
133134
"ifdrop",

pcapkit/const/arp/hardware.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'Hardware':
159159
if isinstance(key, int):
160160
return Hardware(key)
161161
if key not in Hardware._member_map_: # pylint: disable=no-member
162-
extend_enum(Hardware, key, default)
162+
return extend_enum(Hardware, key, default)
163163
return Hardware[key] # type: ignore[misc]
164164

165165
@classmethod
@@ -174,10 +174,8 @@ def _missing_(cls, value: 'int') -> 'Hardware':
174174
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
175175
if 39 <= value <= 255:
176176
#: Unassigned
177-
extend_enum(cls, 'Unassigned_%d' % value, value)
178-
return cls(value)
177+
return extend_enum(cls, 'Unassigned_%d' % value, value)
179178
if 258 <= value <= 65534:
180179
#: Unassigned
181-
extend_enum(cls, 'Unassigned_%d' % value, value)
182-
return cls(value)
180+
return extend_enum(cls, 'Unassigned_%d' % value, value)
183181
return super()._missing_(value)

pcapkit/const/arp/operation.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'Operation':
112112
if isinstance(key, int):
113113
return Operation(key)
114114
if key not in Operation._member_map_: # pylint: disable=no-member
115-
extend_enum(Operation, key, default)
115+
return extend_enum(Operation, key, default)
116116
return Operation[key] # type: ignore[misc]
117117

118118
@classmethod
@@ -127,6 +127,5 @@ def _missing_(cls, value: 'int') -> 'Operation':
127127
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
128128
if 26 <= value <= 65534:
129129
#: Unassigned
130-
extend_enum(cls, 'Unassigned_%d' % value, value)
131-
return cls(value)
130+
return extend_enum(cls, 'Unassigned_%d' % value, value)
132131
return super()._missing_(value)

pcapkit/const/ftp/command.py

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,28 @@
2323
class Command(StrEnum):
2424
"""[Command] FTP Command"""
2525

26+
if TYPE_CHECKING:
27+
#: Feature of command.
28+
feat: 'Optional[str]'
29+
#: Description of command.
30+
desc: 'Optional[str]'
31+
#: Type of command.
32+
type: 'Optional[tuple[str, ...]]'
33+
#: Conformance of command.
34+
conf: 'Optional[str]'
35+
#: Note of command.
36+
note: 'Optional[tuple[str, ...]]'
37+
2638
def __new__(cls, name: 'str', feat: 'Optional[str]' = None, desc: 'Optional[str]' = None,
2739
type: 'Optional[tuple[str, ...]]' = None, conf: 'Optional[str]' = None,
2840
note: 'Optional[tuple[str, ...]]' = None) -> 'Type[Command]':
2941
obj = str.__new__(cls, name)
3042
obj._value_ = name
3143

32-
#: Feature of command.
3344
obj.feat = feat
34-
#: Description of command.
3545
obj.desc = desc
36-
#: Type of command.
3746
obj.type = type
38-
#: Conformance of command.
3947
obj.conf = conf
40-
#: Note of command.
4148
obj.note = note
4249

4350
return obj
@@ -236,7 +243,7 @@ def get(key: 'str', default: 'Optional[str]' = None) -> 'Command':
236243
:meta private:
237244
"""
238245
if key not in Command._member_map_: # pylint: disable=no-member
239-
extend_enum(Command, key.upper(), default if default is not None else key)
246+
return extend_enum(Command, key.upper(), default if default is not None else key)
240247
return Command[key] # type: ignore[misc]
241248

242249
@classmethod
@@ -247,5 +254,4 @@ def _missing_(cls, value: 'str') -> 'Command':
247254
value: Value to get enum item.
248255
249256
"""
250-
extend_enum(cls, value.upper(), value)
251-
return cls(value)
257+
return extend_enum(cls, value.upper(), value)

pcapkit/const/ftp/return_code.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,21 @@
4343
class ReturnCode(IntEnum):
4444
"""[ReturnCode] FTP Server Return Code"""
4545

46+
if TYPE_CHECKING:
47+
#: Description of the return code.
48+
description: 'Optional[str]'
49+
#: Response kind.
50+
kind: 'str'
51+
#: Grouping information.
52+
group: 'str'
53+
4654
def __new__(cls, value: 'int', description: 'Optional[str]' = None) -> 'Type[ReturnCode]':
4755
obj = int.__new__(cls, value)
4856
obj._value_ = value
4957

5058
code = str(value)
51-
#: Description of the return code.
5259
obj.description = description
53-
#: Response kind.
5460
obj.kind = KIND.get(str(value)[0], 'Reserved')
55-
#: Grouping information.
5661
obj.group = INFO.get(str(value)[1], 'Reserved')
5762

5863
return obj
@@ -255,7 +260,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'ReturnCode':
255260
if isinstance(key, int):
256261
return ReturnCode(key)
257262
if key not in ReturnCode._member_map_: # pylint: disable=no-member
258-
extend_enum(ReturnCode, key, default)
263+
return extend_enum(ReturnCode, key, default)
259264
return ReturnCode[key] # type: ignore[misc]
260265

261266
@classmethod
@@ -268,5 +273,4 @@ def _missing_(cls, value: 'int') -> 'ReturnCode':
268273
"""
269274
if not (isinstance(value, int) and 100 <= value <= 659):
270275
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
271-
extend_enum(cls, 'CODE_%s' % value, value)
272-
return cls(value)
276+
return extend_enum(cls, 'CODE_%s' % value, value)

pcapkit/const/hip/certificate.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'Certificate':
5858
if isinstance(key, int):
5959
return Certificate(key)
6060
if key not in Certificate._member_map_: # pylint: disable=no-member
61-
extend_enum(Certificate, key, default)
61+
return extend_enum(Certificate, key, default)
6262
return Certificate[key] # type: ignore[misc]
6363

6464
@classmethod
@@ -73,6 +73,5 @@ def _missing_(cls, value: 'int') -> 'Certificate':
7373
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
7474
if 9 <= value <= 255:
7575
#: Unassigned
76-
extend_enum(cls, 'Unassigned_%d' % value, value)
77-
return cls(value)
76+
return extend_enum(cls, 'Unassigned_%d' % value, value)
7877
return super()._missing_(value)

pcapkit/const/hip/cipher.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'Cipher':
4646
if isinstance(key, int):
4747
return Cipher(key)
4848
if key not in Cipher._member_map_: # pylint: disable=no-member
49-
extend_enum(Cipher, key, default)
49+
return extend_enum(Cipher, key, default)
5050
return Cipher[key] # type: ignore[misc]
5151

5252
@classmethod
@@ -61,6 +61,5 @@ def _missing_(cls, value: 'int') -> 'Cipher':
6161
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
6262
if 5 <= value <= 65535:
6363
#: Unassigned
64-
extend_enum(cls, 'Unassigned_%d' % value, value)
65-
return cls(value)
64+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6665
return super()._missing_(value)

pcapkit/const/hip/di.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'DITypes':
4040
if isinstance(key, int):
4141
return DITypes(key)
4242
if key not in DITypes._member_map_: # pylint: disable=no-member
43-
extend_enum(DITypes, key, default)
43+
return extend_enum(DITypes, key, default)
4444
return DITypes[key] # type: ignore[misc]
4545

4646
@classmethod
@@ -55,6 +55,5 @@ def _missing_(cls, value: 'int') -> 'DITypes':
5555
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
5656
if 3 <= value <= 15:
5757
#: Unassigned
58-
extend_enum(cls, 'Unassigned_%d' % value, value)
59-
return cls(value)
58+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6059
return super()._missing_(value)

pcapkit/const/hip/ecdsa_curve.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'ECDSACurve':
4040
if isinstance(key, int):
4141
return ECDSACurve(key)
4242
if key not in ECDSACurve._member_map_: # pylint: disable=no-member
43-
extend_enum(ECDSACurve, key, default)
43+
return extend_enum(ECDSACurve, key, default)
4444
return ECDSACurve[key] # type: ignore[misc]
4545

4646
@classmethod
@@ -55,6 +55,5 @@ def _missing_(cls, value: 'int') -> 'ECDSACurve':
5555
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
5656
if 3 <= value <= 65535:
5757
#: Unassigned
58-
extend_enum(cls, 'Unassigned_%d' % value, value)
59-
return cls(value)
58+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6059
return super()._missing_(value)

pcapkit/const/hip/ecdsa_low_curve.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'ECDSALowCurve':
3737
if isinstance(key, int):
3838
return ECDSALowCurve(key)
3939
if key not in ECDSALowCurve._member_map_: # pylint: disable=no-member
40-
extend_enum(ECDSALowCurve, key, default)
40+
return extend_enum(ECDSALowCurve, key, default)
4141
return ECDSALowCurve[key] # type: ignore[misc]
4242

4343
@classmethod
@@ -52,6 +52,5 @@ def _missing_(cls, value: 'int') -> 'ECDSALowCurve':
5252
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
5353
if 2 <= value <= 65535:
5454
#: Unassigned
55-
extend_enum(cls, 'Unassigned_%d' % value, value)
56-
return cls(value)
55+
return extend_enum(cls, 'Unassigned_%d' % value, value)
5756
return super()._missing_(value)

pcapkit/const/hip/eddsa_curve.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'EdDSACurve':
4646
if isinstance(key, int):
4747
return EdDSACurve(key)
4848
if key not in EdDSACurve._member_map_: # pylint: disable=no-member
49-
extend_enum(EdDSACurve, key, default)
49+
return extend_enum(EdDSACurve, key, default)
5050
return EdDSACurve[key] # type: ignore[misc]
5151

5252
@classmethod
@@ -61,6 +61,5 @@ def _missing_(cls, value: 'int') -> 'EdDSACurve':
6161
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
6262
if 5 <= value <= 65535:
6363
#: Unassigned
64-
extend_enum(cls, 'Unassigned_%d' % value, value)
65-
return cls(value)
64+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6665
return super()._missing_(value)

pcapkit/const/hip/esp_transform_suite.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'ESPTransformSuite':
7979
if isinstance(key, int):
8080
return ESPTransformSuite(key)
8181
if key not in ESPTransformSuite._member_map_: # pylint: disable=no-member
82-
extend_enum(ESPTransformSuite, key, default)
82+
return extend_enum(ESPTransformSuite, key, default)
8383
return ESPTransformSuite[key] # type: ignore[misc]
8484

8585
@classmethod
@@ -94,6 +94,5 @@ def _missing_(cls, value: 'int') -> 'ESPTransformSuite':
9494
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
9595
if 16 <= value <= 65535:
9696
#: Unassigned
97-
extend_enum(cls, 'Unassigned_%d' % value, value)
98-
return cls(value)
97+
return extend_enum(cls, 'Unassigned_%d' % value, value)
9998
return super()._missing_(value)

pcapkit/const/hip/group.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'Group':
6767
if isinstance(key, int):
6868
return Group(key)
6969
if key not in Group._member_map_: # pylint: disable=no-member
70-
extend_enum(Group, key, default)
70+
return extend_enum(Group, key, default)
7171
return Group[key] # type: ignore[misc]
7272

7373
@classmethod
@@ -82,6 +82,5 @@ def _missing_(cls, value: 'int') -> 'Group':
8282
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
8383
if 12 <= value <= 255:
8484
# Unassigned
85-
extend_enum(cls, 'Unassigned_%d' % value, value)
86-
return cls(value)
85+
return extend_enum(cls, 'Unassigned_%d' % value, value)
8786
return super()._missing_(value)

pcapkit/const/hip/hi_algorithm.py

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'HIAlgorithm':
6464
if isinstance(key, int):
6565
return HIAlgorithm(key)
6666
if key not in HIAlgorithm._member_map_: # pylint: disable=no-member
67-
extend_enum(HIAlgorithm, key, default)
67+
return extend_enum(HIAlgorithm, key, default)
6868
return HIAlgorithm[key] # type: ignore[misc]
6969

7070
@classmethod
@@ -79,10 +79,8 @@ def _missing_(cls, value: 'int') -> 'HIAlgorithm':
7979
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
8080
if 10 <= value <= 12:
8181
#: Unassigned
82-
extend_enum(cls, 'Unassigned_%d' % value, value)
83-
return cls(value)
82+
return extend_enum(cls, 'Unassigned_%d' % value, value)
8483
if 14 <= value <= 65535:
8584
#: Unassigned
86-
extend_enum(cls, 'Unassigned_%d' % value, value)
87-
return cls(value)
85+
return extend_enum(cls, 'Unassigned_%d' % value, value)
8886
return super()._missing_(value)

pcapkit/const/hip/hit_suite.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'HITSuite':
4949
if isinstance(key, int):
5050
return HITSuite(key)
5151
if key not in HITSuite._member_map_: # pylint: disable=no-member
52-
extend_enum(HITSuite, key, default)
52+
return extend_enum(HITSuite, key, default)
5353
return HITSuite[key] # type: ignore[misc]
5454

5555
@classmethod
@@ -64,6 +64,5 @@ def _missing_(cls, value: 'int') -> 'HITSuite':
6464
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
6565
if 6 <= value <= 15:
6666
#: Unassigned
67-
extend_enum(cls, 'Unassigned_%d' % value, value)
68-
return cls(value)
67+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6968
return super()._missing_(value)

pcapkit/const/hip/nat_traversal.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def get(key: 'int | str', default: 'int' = -1) -> 'NATTraversal':
4343
if isinstance(key, int):
4444
return NATTraversal(key)
4545
if key not in NATTraversal._member_map_: # pylint: disable=no-member
46-
extend_enum(NATTraversal, key, default)
46+
return extend_enum(NATTraversal, key, default)
4747
return NATTraversal[key] # type: ignore[misc]
4848

4949
@classmethod
@@ -58,6 +58,5 @@ def _missing_(cls, value: 'int') -> 'NATTraversal':
5858
raise ValueError('%r is not a valid %s' % (value, cls.__name__))
5959
if 4 <= value <= 65535:
6060
#: Unassigned
61-
extend_enum(cls, 'Unassigned_%d' % value, value)
62-
return cls(value)
61+
return extend_enum(cls, 'Unassigned_%d' % value, value)
6362
return super()._missing_(value)

0 commit comments

Comments
 (0)