mirror of
https://github.com/Tautulli/Tautulli.git
synced 2025-08-19 12:59:42 -07:00
Update idna==3.7
This commit is contained in:
parent
7fcd693683
commit
e8c1782540
3 changed files with 2156 additions and 66 deletions
|
@ -150,9 +150,11 @@ def valid_contextj(label: str, pos: int) -> bool:
|
||||||
joining_type = idnadata.joining_types.get(ord(label[i]))
|
joining_type = idnadata.joining_types.get(ord(label[i]))
|
||||||
if joining_type == ord('T'):
|
if joining_type == ord('T'):
|
||||||
continue
|
continue
|
||||||
if joining_type in [ord('L'), ord('D')]:
|
elif joining_type in [ord('L'), ord('D')]:
|
||||||
ok = True
|
ok = True
|
||||||
break
|
break
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
|
||||||
if not ok:
|
if not ok:
|
||||||
return False
|
return False
|
||||||
|
@ -162,9 +164,11 @@ def valid_contextj(label: str, pos: int) -> bool:
|
||||||
joining_type = idnadata.joining_types.get(ord(label[i]))
|
joining_type = idnadata.joining_types.get(ord(label[i]))
|
||||||
if joining_type == ord('T'):
|
if joining_type == ord('T'):
|
||||||
continue
|
continue
|
||||||
if joining_type in [ord('R'), ord('D')]:
|
elif joining_type in [ord('R'), ord('D')]:
|
||||||
ok = True
|
ok = True
|
||||||
break
|
break
|
||||||
|
else:
|
||||||
|
break
|
||||||
return ok
|
return ok
|
||||||
|
|
||||||
if cp_value == 0x200d:
|
if cp_value == 0x200d:
|
||||||
|
@ -236,13 +240,9 @@ def check_label(label: Union[str, bytes, bytearray]) -> None:
|
||||||
if intranges_contain(cp_value, idnadata.codepoint_classes['PVALID']):
|
if intranges_contain(cp_value, idnadata.codepoint_classes['PVALID']):
|
||||||
continue
|
continue
|
||||||
elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTJ']):
|
elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTJ']):
|
||||||
try:
|
|
||||||
if not valid_contextj(label, pos):
|
if not valid_contextj(label, pos):
|
||||||
raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
|
raise InvalidCodepointContext('Joiner {} not allowed at position {} in {}'.format(
|
||||||
_unot(cp_value), pos+1, repr(label)))
|
_unot(cp_value), pos+1, repr(label)))
|
||||||
except ValueError:
|
|
||||||
raise IDNAError('Unknown codepoint adjacent to joiner {} at position {} in {}'.format(
|
|
||||||
_unot(cp_value), pos+1, repr(label)))
|
|
||||||
elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTO']):
|
elif intranges_contain(cp_value, idnadata.codepoint_classes['CONTEXTO']):
|
||||||
if not valid_contexto(label, pos):
|
if not valid_contexto(label, pos):
|
||||||
raise InvalidCodepointContext('Codepoint {} not allowed at position {} in {}'.format(_unot(cp_value), pos+1, repr(label)))
|
raise InvalidCodepointContext('Codepoint {} not allowed at position {} in {}'.format(_unot(cp_value), pos+1, repr(label)))
|
||||||
|
@ -262,13 +262,8 @@ def alabel(label: str) -> bytes:
|
||||||
except UnicodeEncodeError:
|
except UnicodeEncodeError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
if not label:
|
|
||||||
raise IDNAError('No Input')
|
|
||||||
|
|
||||||
label = str(label)
|
|
||||||
check_label(label)
|
check_label(label)
|
||||||
label_bytes = _punycode(label)
|
label_bytes = _alabel_prefix + _punycode(label)
|
||||||
label_bytes = _alabel_prefix + label_bytes
|
|
||||||
|
|
||||||
if not valid_label_length(label_bytes):
|
if not valid_label_length(label_bytes):
|
||||||
raise IDNAError('Label too long')
|
raise IDNAError('Label too long')
|
||||||
|
|
2197
lib/idna/idnadata.py
2197
lib/idna/idnadata.py
File diff suppressed because it is too large
Load diff
|
@ -1,2 +1,2 @@
|
||||||
__version__ = '3.6'
|
__version__ = '3.7'
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue