Skip to content

Commit b178976

Browse files
authored
Merge branch 'master' into dev
2 parents 068f48f + fc91a61 commit b178976

File tree

8 files changed

+278
-235
lines changed

8 files changed

+278
-235
lines changed

.github/workflows/python-package.yml

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ jobs:
1515
strategy:
1616
matrix:
1717
python-version:
18-
- '3.7'
1918
- '3.8'
2019
- '3.9'
2120
- '3.10'

idna/codec.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ def search_function(name: str) -> Optional[codecs.CodecInfo]:
107107
return None
108108
return codecs.CodecInfo(
109109
name=name,
110-
encode=Codec().encode, # type: ignore
111-
decode=Codec().decode, # type: ignore
110+
encode=Codec().encode,
111+
decode=Codec().decode,
112112
incrementalencoder=IncrementalEncoder,
113113
incrementaldecoder=IncrementalDecoder,
114114
streamwriter=StreamWriter,

idna/core.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ def uts46_remap(domain: str, std3_rules: bool = True, transitional: bool = False
313313
status = uts46row[1]
314314
replacement = None # type: Optional[str]
315315
if len(uts46row) == 3:
316-
replacement = uts46row[2] # type: ignore
316+
replacement = uts46row[2]
317317
if (status == 'V' or
318318
(status == 'D' and not transitional) or
319319
(status == '3' and not std3_rules and replacement is None)):

idna/idnadata.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# This file is automatically generated by tools/idna-data
22

3-
__version__ = '15.0.0'
3+
__version__ = '15.1.0'
44
scripts = {
55
'Greek': (
66
0x37000000374,
@@ -59,6 +59,7 @@
5959
0x2b7400002b81e,
6060
0x2b8200002cea2,
6161
0x2ceb00002ebe1,
62+
0x2ebf00002ee5e,
6263
0x2f8000002fa1e,
6364
0x300000003134b,
6465
0x31350000323b0,
@@ -2131,6 +2132,7 @@
21312132
0x2b7400002b81e,
21322133
0x2b8200002cea2,
21332134
0x2ceb00002ebe1,
2135+
0x2ebf00002ee5e,
21342136
0x300000003134b,
21352137
0x31350000323b0,
21362138
),

0 commit comments

Comments
 (0)