Skip to content

Commit

Permalink
Merge branch 'master' into isidna
Browse files Browse the repository at this point in the history
  • Loading branch information
elliotwutingfeng authored Nov 23, 2023
2 parents 861b900 + fc91a61 commit addfe3b
Show file tree
Hide file tree
Showing 8 changed files with 278 additions and 235 deletions.
1 change: 0 additions & 1 deletion .github/workflows/python-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ jobs:
strategy:
matrix:
python-version:
- '3.7'
- '3.8'
- '3.9'
- '3.10'
Expand Down
4 changes: 2 additions & 2 deletions idna/codec.py
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
return None
return codecs.CodecInfo(
name=name,
encode=Codec().encode, # type: ignore
decode=Codec().decode, # type: ignore
encode=Codec().encode,
decode=Codec().decode,
incrementalencoder=IncrementalEncoder,
incrementaldecoder=IncrementalDecoder,
streamwriter=StreamWriter,
Expand Down
2 changes: 1 addition & 1 deletion idna/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,7 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False
status = uts46row[1]
replacement = None # type: Optional[str]
if len(uts46row) == 3:
replacement = uts46row[2] # type: ignore
replacement = uts46row[2]
if (status == 'V' or
(status == 'D' and not transitional) or
(status == '3' and not std3_rules and replacement is None)):
Expand Down
4 changes: 3 additions & 1 deletion idna/idnadata.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# This file is automatically generated by tools/idna-data

__version__ = '15.0.0'
__version__ = '15.1.0'
scripts = {
'Greek': (
0x37000000374,
Expand Down Expand Up @@ -59,6 +59,7 @@
0x2b7400002b81e,
0x2b8200002cea2,
0x2ceb00002ebe1,
0x2ebf00002ee5e,
0x2f8000002fa1e,
0x300000003134b,
0x31350000323b0,
Expand Down Expand Up @@ -2131,6 +2132,7 @@
0x2b7400002b81e,
0x2b8200002cea2,
0x2ceb00002ebe1,
0x2ebf00002ee5e,
0x300000003134b,
0x31350000323b0,
),
Expand Down
Loading

0 comments on commit addfe3b

Please sign in to comment.