aboutsummaryrefslogtreecommitdiff
path: root/lib/wind
diff options
context:
space:
mode:
authorCy Schubert <cy@FreeBSD.org>2022-03-28 17:02:13 +0000
committerCy Schubert <cy@FreeBSD.org>2022-03-28 17:02:13 +0000
commit49af073ed77202a54dfdd773cbcbbf7835c75baf (patch)
treeb180dbeab238a3d30b8d99d05c9cf0e30fbadd5a /lib/wind
parentd684f11da759490a8d98d7b790796106285f4084 (diff)
heimdal: Vendor import 7.7.0vendor/heimdal/7.7.0
Diffstat (limited to 'lib/wind')
-rw-r--r--lib/wind/UnicodeData.py2
-rw-r--r--lib/wind/bidi_table.c2
-rw-r--r--lib/wind/bidi_table.h2
-rw-r--r--lib/wind/combining_table.c2
-rw-r--r--lib/wind/combining_table.h2
-rw-r--r--lib/wind/errorlist_table.c2
-rw-r--r--lib/wind/errorlist_table.h2
-rw-r--r--lib/wind/gen-bidi.py2
-rw-r--r--lib/wind/gen-combining.py5
-rw-r--r--lib/wind/gen-errorlist.py8
-rw-r--r--lib/wind/gen-map.py12
-rw-r--r--lib/wind/gen-normalize.py8
-rw-r--r--lib/wind/gen-punycode-examples.py9
-rw-r--r--lib/wind/generate.py9
-rw-r--r--lib/wind/map_table.c2
-rw-r--r--lib/wind/map_table.h2
-rw-r--r--lib/wind/normalize_table.c2
-rw-r--r--lib/wind/normalize_table.h2
-rw-r--r--lib/wind/punycode_examples.c40
-rw-r--r--lib/wind/punycode_examples.h2
-rw-r--r--lib/wind/stringprep.py2
21 files changed, 61 insertions, 58 deletions
diff --git a/lib/wind/UnicodeData.py b/lib/wind/UnicodeData.py
index dd6dfa745d9f..8ce3bcade279 100644
--- a/lib/wind/UnicodeData.py
+++ b/lib/wind/UnicodeData.py
@@ -50,7 +50,7 @@ def read(filename):
continue
f = l.split(';')
key = int(f[0], 0x10)
- if key in ret:
+ if key in ret:
raise Exception('Duplicate key in UnicodeData')
ret[key] = f[1:]
ud.close()
diff --git a/lib/wind/bidi_table.c b/lib/wind/bidi_table.c
index 916805fdc614..5628c3bd1c73 100644
--- a/lib/wind/bidi_table.c
+++ b/lib/wind/bidi_table.c
@@ -1,5 +1,5 @@
/* ./bidi_table.c */
-/* Automatically generated at 2017-12-08T03:21:13.199657 */
+/* Automatically generated at 2019-06-07T02:26:41.397837 */
#include "bidi_table.h"
diff --git a/lib/wind/bidi_table.h b/lib/wind/bidi_table.h
index 3fc83d2e4e7b..f00ddb1b6763 100644
--- a/lib/wind/bidi_table.h
+++ b/lib/wind/bidi_table.h
@@ -1,5 +1,5 @@
/* ./bidi_table.h */
-/* Automatically generated at 2017-12-08T03:21:13.199278 */
+/* Automatically generated at 2019-06-07T02:26:41.396770 */
#ifndef BIDI_TABLE_H
#define BIDI_TABLE_H 1
diff --git a/lib/wind/combining_table.c b/lib/wind/combining_table.c
index a69ef4127693..71218362fc35 100644
--- a/lib/wind/combining_table.c
+++ b/lib/wind/combining_table.c
@@ -1,5 +1,5 @@
/* ./combining_table.c */
-/* Automatically generated at 2017-12-08T03:21:13.302135 */
+/* Automatically generated at 2019-06-07T02:26:41.530824 */
#include "combining_table.h"
diff --git a/lib/wind/combining_table.h b/lib/wind/combining_table.h
index cd2c03264de0..023857adda64 100644
--- a/lib/wind/combining_table.h
+++ b/lib/wind/combining_table.h
@@ -1,5 +1,5 @@
/* ./combining_table.h */
-/* Automatically generated at 2017-12-08T03:21:13.301786 */
+/* Automatically generated at 2019-06-07T02:26:41.530328 */
#ifndef COMBINING_TABLE_H
#define COMBINING_TABLE_H 1
diff --git a/lib/wind/errorlist_table.c b/lib/wind/errorlist_table.c
index be0bfce26245..241e39bb05f3 100644
--- a/lib/wind/errorlist_table.c
+++ b/lib/wind/errorlist_table.c
@@ -1,5 +1,5 @@
/* ./errorlist_table.c */
-/* Automatically generated at 2017-12-08T03:21:13.365706 */
+/* Automatically generated at 2019-06-07T02:26:41.399027 */
#include "errorlist_table.h"
diff --git a/lib/wind/errorlist_table.h b/lib/wind/errorlist_table.h
index beebfb55aa82..546048fae751 100644
--- a/lib/wind/errorlist_table.h
+++ b/lib/wind/errorlist_table.h
@@ -1,5 +1,5 @@
/* ./errorlist_table.h */
-/* Automatically generated at 2017-12-08T03:21:13.365395 */
+/* Automatically generated at 2019-06-07T02:26:41.398369 */
#ifndef ERRORLIST_TABLE_H
#define ERRORLIST_TABLE_H 1
diff --git a/lib/wind/gen-bidi.py b/lib/wind/gen-bidi.py
index 21839c2550b2..e2efcbb555a2 100644
--- a/lib/wind/gen-bidi.py
+++ b/lib/wind/gen-bidi.py
@@ -42,7 +42,7 @@ import generate
import rfc3454
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt outdir" % sys.argv[0]
+ print("usage: %s rfc3454.txt outdir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
diff --git a/lib/wind/gen-combining.py b/lib/wind/gen-combining.py
index 86cbc6d50f0c..43e0d52eb3cf 100644
--- a/lib/wind/gen-combining.py
+++ b/lib/wind/gen-combining.py
@@ -42,7 +42,7 @@ import generate
import UnicodeData
if len(sys.argv) != 3:
- print "usage: %s UnicodeData.txt out-dir" % sys.argv[0]
+ print("usage: %s UnicodeData.txt out-dir" % sys.argv[0])
sys.exit(1)
ud = UnicodeData.read(sys.argv[1])
@@ -79,8 +79,7 @@ combining_c.file.write(
const struct translation _wind_combining_table[] = {
''')
-s = trans.keys()
-s.sort()
+s = sorted(trans)
for k in s:
v = trans[k]
combining_c.file.write("{0x%x, %u}, /* %s */\n"
diff --git a/lib/wind/gen-errorlist.py b/lib/wind/gen-errorlist.py
index f0b9524783b4..97646cf5aed6 100644
--- a/lib/wind/gen-errorlist.py
+++ b/lib/wind/gen-errorlist.py
@@ -44,13 +44,13 @@ import rfc4518
import stringprep
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
+ print("usage: %s rfc3454.txt out-dir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
t2 = rfc4518.read()
-for x in t2.iterkeys():
+for x in t2.keys():
tables[x] = t2[x]
error_list = stringprep.get_errorlist()
@@ -85,7 +85,7 @@ const struct error_entry _wind_errorlist_table[] = {
trans=[]
-for t in error_list.iterkeys():
+for t in error_list.keys():
for l in tables[t]:
m = re.search('^ *([0-9A-F]+)-([0-9A-F]+); *(.*) *$', l)
if m:
@@ -104,7 +104,7 @@ for x in trans:
(start, length, description, tables) = x
symbols = stringprep.symbols(error_list, tables)
if len(symbols) == 0:
- print "no symbol for %s" % description
+ print("no symbol for %s" % description)
sys.exit(1)
errorlist_c.file.write(" {0x%x, 0x%x, %s}, /* %s: %s */\n"
% (start, length, symbols, ",".join(tables), description))
diff --git a/lib/wind/gen-map.py b/lib/wind/gen-map.py
index d4f02af1f29d..dc10d6fae7f6 100644
--- a/lib/wind/gen-map.py
+++ b/lib/wind/gen-map.py
@@ -45,13 +45,13 @@ import stringprep
import util
if len(sys.argv) != 3:
- print "usage: %s rfc3454.txt out-dir" % sys.argv[0]
+ print("usage: %s rfc3454.txt out-dir" % sys.argv[0])
sys.exit(1)
tables = rfc3454.read(sys.argv[1])
t2 = rfc4518.read()
-for x in t2.iterkeys():
+for x in t2:
tables[x] = t2[x]
map_list = stringprep.get_maplist()
@@ -88,7 +88,7 @@ const struct translation _wind_map_table[] = {
trans=[]
-for t in map_list.iterkeys():
+for t in map_list:
for l in tables[t]:
m = re.search('^ *([0-9A-F]+)-([0-9A-F]+); *([^;]+); *(.*) *$', l)
if m:
@@ -96,7 +96,7 @@ for t in map_list.iterkeys():
end = int(m.group(2), 0x10)
value = m.group(3)
desc = m.group(4)
- for key in xrange(start,end,1):
+ for key in range(start,end,1):
trans.append((key, value, desc, [t]))
continue
m = re.search('^ *([^;]+); *([^;]+); *(.*) *$', l)
@@ -114,7 +114,7 @@ trans = stringprep.sort_merge_trans(trans)
for x in trans:
if x[0] == 0xad:
- print "fooresult %s" % ",".join(x[3])
+ print("fooresult %s" % ",".join(x[3]))
for x in trans:
(key, value, description, table) = x
@@ -130,7 +130,7 @@ for x in trans:
(key, value, description, tables) = x
symbols = stringprep.symbols(map_list, tables)
if len(symbols) == 0:
- print "no symbol for %s %s (%s)" % (key, description, tables)
+ print("no symbol for %s %s (%s)" % (key, description, tables))
sys.exit(1)
v = value.split()
map_c.file.write(" {0x%x, %u, %u, %s}, /* %s: %s */\n"
diff --git a/lib/wind/gen-normalize.py b/lib/wind/gen-normalize.py
index 9b3553c46d0d..daf3c3dc42f1 100644
--- a/lib/wind/gen-normalize.py
+++ b/lib/wind/gen-normalize.py
@@ -43,15 +43,15 @@ import UnicodeData
import util
if len(sys.argv) != 4:
- print "usage: %s UnicodeData.txt"
- " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0]
+ print("usage: %s UnicodeData.txt"
+ " CompositionExclusions-3.2.0.txt out-dir" % sys.argv[0])
sys.exit(1)
ud = UnicodeData.read(sys.argv[1])
def sortedKeys(d):
"""Return a sorted list of the keys of a dict"""
- keys = d.keys()
+ keys = list(d.keys())
keys.sort()
return keys
@@ -136,7 +136,7 @@ exclusions = UnicodeData.read(sys.argv[2])
inv = dict([(''.join(["%05x" % int(x, 0x10) for x in v[4].split(' ')]),
[k, v[0]])
for k,v in ud.items()
- if v[4] and not re.search('<[a-zA-Z]+> *', v[4]) and not exclusions.has_key(k)])
+ if v[4] and not re.search('<[a-zA-Z]+> *', v[4]) and not k in exclusions])
table = 0
diff --git a/lib/wind/gen-punycode-examples.py b/lib/wind/gen-punycode-examples.py
index 44f5dafe508c..f2eddbb37386 100644
--- a/lib/wind/gen-punycode-examples.py
+++ b/lib/wind/gen-punycode-examples.py
@@ -35,13 +35,12 @@
# SUCH DAMAGE.
import re
-import string
import sys
import generate
if len(sys.argv) != 3:
- print "usage: %s rfc3492.txt" % sys.argv[0]
+ print("usage: %s rfc3492.txt" % sys.argv[0])
sys.exit(1)
f = open(sys.argv[1], 'r')
@@ -72,7 +71,7 @@ while True:
else:
m = re.search('^ *([uU]+.*) *$', l)
if m:
- codes.extend(string.split(m.group(1), ' '))
+ codes.extend(m.group(1).split(' '))
else:
m = re.search('^ *Punycode: (.*) *$', l)
if m:
@@ -81,7 +80,7 @@ while True:
if re.match('^7\.1', l):
start = True
cases = []
-
+
f.close()
examples_h.file.write(
@@ -115,7 +114,7 @@ for x in cases:
examples_c.file.write(
" {%u, {%s}, \"%s\", \"%s\"},\n" %
(len(cp),
- string.join([re.sub('[uU]\+', '0x', x) for x in cp], ', '),
+ ",".join([re.sub('[uU]\+', '0x', x) for x in cp]),
pc,
desc))
diff --git a/lib/wind/generate.py b/lib/wind/generate.py
index 1d708c6a3c47..0a32fcd4d4d8 100644
--- a/lib/wind/generate.py
+++ b/lib/wind/generate.py
@@ -37,6 +37,7 @@
import datetime
import string
import os
+import sys
class GeneratedFile :
"Represents a generated file"
@@ -56,10 +57,14 @@ class GeneratedFile :
class Header(GeneratedFile) :
"Represents a generated header file"
- guardTrans = string.maketrans('-.', '__')
+ if sys.hexversion>0x300000f:
+ guardTrans = bytes.maketrans(b'-.', b'__')
+ else:
+ import string
+ guardTrans = string.maketrans('-.', '__')
def makeGuard(self) :
"""Return a name to be used as ifdef guard"""
- return string.upper(string.translate(self.name, self.guardTrans))
+ return self.name.translate(self.guardTrans).upper()
def __init__(self, name) :
"Create a new Header with name"
diff --git a/lib/wind/map_table.c b/lib/wind/map_table.c
index 9be8c9241f24..abce7bef5fb6 100644
--- a/lib/wind/map_table.c
+++ b/lib/wind/map_table.c
@@ -1,5 +1,5 @@
/* ./map_table.c */
-/* Automatically generated at 2017-12-08T03:21:13.416181 */
+/* Automatically generated at 2019-06-07T02:26:41.398537 */
#include "map_table.h"
diff --git a/lib/wind/map_table.h b/lib/wind/map_table.h
index fb6c773d99c9..ae8e90356825 100644
--- a/lib/wind/map_table.h
+++ b/lib/wind/map_table.h
@@ -1,5 +1,5 @@
/* ./map_table.h */
-/* Automatically generated at 2017-12-08T03:21:13.415873 */
+/* Automatically generated at 2019-06-07T02:26:41.397498 */
#ifndef MAP_TABLE_H
#define MAP_TABLE_H 1
diff --git a/lib/wind/normalize_table.c b/lib/wind/normalize_table.c
index 2f9a690e3f2c..0a11b0d29dd1 100644
--- a/lib/wind/normalize_table.c
+++ b/lib/wind/normalize_table.c
@@ -1,5 +1,5 @@
/* ./normalize_table.c */
-/* Automatically generated at 2017-12-08T03:21:13.608557 */
+/* Automatically generated at 2019-06-07T02:26:41.707824 */
#include "normalize_table.h"
diff --git a/lib/wind/normalize_table.h b/lib/wind/normalize_table.h
index 52b1f5292d6e..d82cc26d4c03 100644
--- a/lib/wind/normalize_table.h
+++ b/lib/wind/normalize_table.h
@@ -1,5 +1,5 @@
/* ./normalize_table.h */
-/* Automatically generated at 2017-12-08T03:21:13.608247 */
+/* Automatically generated at 2019-06-07T02:26:41.685585 */
#ifndef NORMALIZE_TABLE_H
#define NORMALIZE_TABLE_H 1
diff --git a/lib/wind/punycode_examples.c b/lib/wind/punycode_examples.c
index 6252952e6e45..7336f3eacfea 100644
--- a/lib/wind/punycode_examples.c
+++ b/lib/wind/punycode_examples.c
@@ -1,5 +1,5 @@
/* ./punycode_examples.c */
-/* Automatically generated at 2017-12-08T03:21:15.326628 */
+/* Automatically generated at 2019-06-07T02:40:18.438604 */
#ifndef PUNYCODE_EXAMPLES_C
#define PUNYCODE_EXAMPLES_C 1
@@ -8,25 +8,25 @@
#include "punycode_examples.h"
const struct punycode_example punycode_examples[] = {
- {17, {0x0644, 0x064A, 0x0647, 0x0645, 0x0627, 0x0628, 0x062A, 0x0643, 0x0644, 0x0645, 0x0648, 0x0634, 0x0639, 0x0631, 0x0628, 0x064A, 0x061F}, "egbpdaj6bu4bxfgehfvwxn", "Arabic (Egyptian):"},
- {9, {0x4ED6, 0x4EEC, 0x4E3A, 0x4EC0, 0x4E48, 0x4E0D, 0x8BF4, 0x4E2D, 0x6587}, "ihqwcrb4cv8a8dqg056pqjye", "Chinese (simplified):"},
- {9, {0x4ED6, 0x5011, 0x7232, 0x4EC0, 0x9EBD, 0x4E0D, 0x8AAA, 0x4E2D, 0x6587}, "ihqwctvzc91f659drss3x8bo0yb", "Chinese (traditional):"},
- {22, {0x0050, 0x0072, 0x006F, 0x010D, 0x0070, 0x0072, 0x006F, 0x0073, 0x0074, 0x011B, 0x006E, 0x0065, 0x006D, 0x006C, 0x0075, 0x0076, 0x00ED, 0x010D, 0x0065, 0x0073, 0x006B, 0x0079}, "Proprostnemluvesky-uyb24dma41a", "Czech: Pro<ccaron>prost<ecaron>nemluv<iacute><ccaron>esky"},
- {22, {0x05DC, 0x05DE, 0x05D4, 0x05D4, 0x05DD, 0x05E4, 0x05E9, 0x05D5, 0x05D8, 0x05DC, 0x05D0, 0x05DE, 0x05D3, 0x05D1, 0x05E8, 0x05D9, 0x05DD, 0x05E2, 0x05D1, 0x05E8, 0x05D9, 0x05EA}, "4dbcagdahymbxekheh6e0a7fei0b", "Hebrew:"},
- {30, {0x092F, 0x0939, 0x0932, 0x094B, 0x0917, 0x0939, 0x093F, 0x0928, 0x094D, 0x0926, 0x0940, 0x0915, 0x094D, 0x092F, 0x094B, 0x0902, 0x0928, 0x0939, 0x0940, 0x0902, 0x092C, 0x094B, 0x0932, 0x0938, 0x0915, 0x0924, 0x0947, 0x0939, 0x0948, 0x0902}, "i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd", "Hindi (Devanagari):"},
- {18, {0x306A, 0x305C, 0x307F, 0x3093, 0x306A, 0x65E5, 0x672C, 0x8A9E, 0x3092, 0x8A71, 0x3057, 0x3066, 0x304F, 0x308C, 0x306A, 0x3044, 0x306E, 0x304B}, "n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa", "Japanese (kanji and hiragana):"},
- {24, {0xC138, 0xACC4, 0xC758, 0xBAA8, 0xB4E0, 0xC0AC, 0xB78C, 0xB4E4, 0xC774, 0xD55C, 0xAD6D, 0xC5B4, 0xB97C, 0xC774, 0xD574, 0xD55C, 0xB2E4, 0xBA74, 0xC5BC, 0xB9C8, 0xB098, 0xC88B, 0xC744, 0xAE4C}, "989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c", "Korean (Hangul syllables):"},
- {28, {0x043F, 0x043E, 0x0447, 0x0435, 0x043C, 0x0443, 0x0436, 0x0435, 0x043E, 0x043D, 0x0438, 0x043D, 0x0435, 0x0433, 0x043E, 0x0432, 0x043E, 0x0440, 0x044F, 0x0442, 0x043F, 0x043E, 0x0440, 0x0443, 0x0441, 0x0441, 0x043A, 0x0438}, "b1abfaaepdrnnbgefbaDotcwatmq2g4l", "Russian (Cyrillic):"},
- {40, {0x0050, 0x006F, 0x0072, 0x0071, 0x0075, 0x00E9, 0x006E, 0x006F, 0x0070, 0x0075, 0x0065, 0x0064, 0x0065, 0x006E, 0x0073, 0x0069, 0x006D, 0x0070, 0x006C, 0x0065, 0x006D, 0x0065, 0x006E, 0x0074, 0x0065, 0x0068, 0x0061, 0x0062, 0x006C, 0x0061, 0x0072, 0x0065, 0x006E, 0x0045, 0x0073, 0x0070, 0x0061, 0x00F1, 0x006F, 0x006C}, "PorqunopuedensimplementehablarenEspaol-fmd56a", "Spanish: Porqu<eacute>nopuedensimplementehablarenEspa<ntilde>ol"},
- {31, {0x0054, 0x1EA1, 0x0069, 0x0073, 0x0061, 0x006F, 0x0068, 0x1ECD, 0x006B, 0x0068, 0x00F4, 0x006E, 0x0067, 0x0074, 0x0068, 0x1EC3, 0x0063, 0x0068, 0x1EC9, 0x006E, 0x00F3, 0x0069, 0x0074, 0x0069, 0x1EBF, 0x006E, 0x0067, 0x0056, 0x0069, 0x1EC7, 0x0074}, "TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g", "Vietnamese:"},
- {8, {0x0033, 0x5E74, 0x0042, 0x7D44, 0x91D1, 0x516B, 0x5148, 0x751F}, "3B-ww4c5e180e575a65lsy2b", "3<nen>B<gumi><kinpachi><sensei>"},
- {24, {0x5B89, 0x5BA4, 0x5948, 0x7F8E, 0x6075, 0x002D, 0x0077, 0x0069, 0x0074, 0x0068, 0x002D, 0x0053, 0x0055, 0x0050, 0x0045, 0x0052, 0x002D, 0x004D, 0x004F, 0x004E, 0x004B, 0x0045, 0x0059, 0x0053}, "-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n", "<amuro><namie>-with-SUPER-MONKEYS"},
- {25, {0x0048, 0x0065, 0x006C, 0x006C, 0x006F, 0x002D, 0x0041, 0x006E, 0x006F, 0x0074, 0x0068, 0x0065, 0x0072, 0x002D, 0x0057, 0x0061, 0x0079, 0x002D, 0x305D, 0x308C, 0x305E, 0x308C, 0x306E, 0x5834, 0x6240}, "Hello-Another-Way--fc4qua05auwb3674vfr0b", "Hello-Another-Way-<sorezore><no><basho>"},
- {8, {0x3072, 0x3068, 0x3064, 0x5C4B, 0x6839, 0x306E, 0x4E0B, 0x0032}, "2-u9tlzr9756bt3uc0v", "<hitotsu><yane><no><shita>2"},
- {13, {0x004D, 0x0061, 0x006A, 0x0069, 0x3067, 0x004B, 0x006F, 0x0069, 0x3059, 0x308B, 0x0035, 0x79D2, 0x524D}, "MajiKoi5-783gue6qz075azm5e", "Maji<de>Koi<suru>5<byou><mae>"},
- {9, {0x30D1, 0x30D5, 0x30A3, 0x30FC, 0x0064, 0x0065, 0x30EB, 0x30F3, 0x30D0}, "de-jg4avhby1noc0d", "<pafii>de<runba>"},
- {7, {0x305D, 0x306E, 0x30B9, 0x30D4, 0x30FC, 0x30C9, 0x3067}, "d9juau41awczczp", "<sono><supiido><de>"},
- {11, {0x002D, 0x003E, 0x0020, 0x0024, 0x0031, 0x002E, 0x0030, 0x0030, 0x0020, 0x003C, 0x002D}, "-> $1.00 <--", "-> $1.00 <-"},
+ {17, {0x0644,0x064A,0x0647,0x0645,0x0627,0x0628,0x062A,0x0643,0x0644,0x0645,0x0648,0x0634,0x0639,0x0631,0x0628,0x064A,0x061F}, "egbpdaj6bu4bxfgehfvwxn", "Arabic (Egyptian):"},
+ {9, {0x4ED6,0x4EEC,0x4E3A,0x4EC0,0x4E48,0x4E0D,0x8BF4,0x4E2D,0x6587}, "ihqwcrb4cv8a8dqg056pqjye", "Chinese (simplified):"},
+ {9, {0x4ED6,0x5011,0x7232,0x4EC0,0x9EBD,0x4E0D,0x8AAA,0x4E2D,0x6587}, "ihqwctvzc91f659drss3x8bo0yb", "Chinese (traditional):"},
+ {22, {0x0050,0x0072,0x006F,0x010D,0x0070,0x0072,0x006F,0x0073,0x0074,0x011B,0x006E,0x0065,0x006D,0x006C,0x0075,0x0076,0x00ED,0x010D,0x0065,0x0073,0x006B,0x0079}, "Proprostnemluvesky-uyb24dma41a", "Czech: Pro<ccaron>prost<ecaron>nemluv<iacute><ccaron>esky"},
+ {22, {0x05DC,0x05DE,0x05D4,0x05D4,0x05DD,0x05E4,0x05E9,0x05D5,0x05D8,0x05DC,0x05D0,0x05DE,0x05D3,0x05D1,0x05E8,0x05D9,0x05DD,0x05E2,0x05D1,0x05E8,0x05D9,0x05EA}, "4dbcagdahymbxekheh6e0a7fei0b", "Hebrew:"},
+ {30, {0x092F,0x0939,0x0932,0x094B,0x0917,0x0939,0x093F,0x0928,0x094D,0x0926,0x0940,0x0915,0x094D,0x092F,0x094B,0x0902,0x0928,0x0939,0x0940,0x0902,0x092C,0x094B,0x0932,0x0938,0x0915,0x0924,0x0947,0x0939,0x0948,0x0902}, "i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd", "Hindi (Devanagari):"},
+ {18, {0x306A,0x305C,0x307F,0x3093,0x306A,0x65E5,0x672C,0x8A9E,0x3092,0x8A71,0x3057,0x3066,0x304F,0x308C,0x306A,0x3044,0x306E,0x304B}, "n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa", "Japanese (kanji and hiragana):"},
+ {24, {0xC138,0xACC4,0xC758,0xBAA8,0xB4E0,0xC0AC,0xB78C,0xB4E4,0xC774,0xD55C,0xAD6D,0xC5B4,0xB97C,0xC774,0xD574,0xD55C,0xB2E4,0xBA74,0xC5BC,0xB9C8,0xB098,0xC88B,0xC744,0xAE4C}, "989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5jpsd879ccm6fea98c", "Korean (Hangul syllables):"},
+ {28, {0x043F,0x043E,0x0447,0x0435,0x043C,0x0443,0x0436,0x0435,0x043E,0x043D,0x0438,0x043D,0x0435,0x0433,0x043E,0x0432,0x043E,0x0440,0x044F,0x0442,0x043F,0x043E,0x0440,0x0443,0x0441,0x0441,0x043A,0x0438}, "b1abfaaepdrnnbgefbaDotcwatmq2g4l", "Russian (Cyrillic):"},
+ {40, {0x0050,0x006F,0x0072,0x0071,0x0075,0x00E9,0x006E,0x006F,0x0070,0x0075,0x0065,0x0064,0x0065,0x006E,0x0073,0x0069,0x006D,0x0070,0x006C,0x0065,0x006D,0x0065,0x006E,0x0074,0x0065,0x0068,0x0061,0x0062,0x006C,0x0061,0x0072,0x0065,0x006E,0x0045,0x0073,0x0070,0x0061,0x00F1,0x006F,0x006C}, "PorqunopuedensimplementehablarenEspaol-fmd56a", "Spanish: Porqu<eacute>nopuedensimplementehablarenEspa<ntilde>ol"},
+ {31, {0x0054,0x1EA1,0x0069,0x0073,0x0061,0x006F,0x0068,0x1ECD,0x006B,0x0068,0x00F4,0x006E,0x0067,0x0074,0x0068,0x1EC3,0x0063,0x0068,0x1EC9,0x006E,0x00F3,0x0069,0x0074,0x0069,0x1EBF,0x006E,0x0067,0x0056,0x0069,0x1EC7,0x0074}, "TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g", "Vietnamese:"},
+ {8, {0x0033,0x5E74,0x0042,0x7D44,0x91D1,0x516B,0x5148,0x751F}, "3B-ww4c5e180e575a65lsy2b", "3<nen>B<gumi><kinpachi><sensei>"},
+ {24, {0x5B89,0x5BA4,0x5948,0x7F8E,0x6075,0x002D,0x0077,0x0069,0x0074,0x0068,0x002D,0x0053,0x0055,0x0050,0x0045,0x0052,0x002D,0x004D,0x004F,0x004E,0x004B,0x0045,0x0059,0x0053}, "-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n", "<amuro><namie>-with-SUPER-MONKEYS"},
+ {25, {0x0048,0x0065,0x006C,0x006C,0x006F,0x002D,0x0041,0x006E,0x006F,0x0074,0x0068,0x0065,0x0072,0x002D,0x0057,0x0061,0x0079,0x002D,0x305D,0x308C,0x305E,0x308C,0x306E,0x5834,0x6240}, "Hello-Another-Way--fc4qua05auwb3674vfr0b", "Hello-Another-Way-<sorezore><no><basho>"},
+ {8, {0x3072,0x3068,0x3064,0x5C4B,0x6839,0x306E,0x4E0B,0x0032}, "2-u9tlzr9756bt3uc0v", "<hitotsu><yane><no><shita>2"},
+ {13, {0x004D,0x0061,0x006A,0x0069,0x3067,0x004B,0x006F,0x0069,0x3059,0x308B,0x0035,0x79D2,0x524D}, "MajiKoi5-783gue6qz075azm5e", "Maji<de>Koi<suru>5<byou><mae>"},
+ {9, {0x30D1,0x30D5,0x30A3,0x30FC,0x0064,0x0065,0x30EB,0x30F3,0x30D0}, "de-jg4avhby1noc0d", "<pafii>de<runba>"},
+ {7, {0x305D,0x306E,0x30B9,0x30D4,0x30FC,0x30C9,0x3067}, "d9juau41awczczp", "<sono><supiido><de>"},
+ {11, {0x002D,0x003E,0x0020,0x0024,0x0031,0x002E,0x0030,0x0030,0x0020,0x003C,0x002D}, "-> $1.00 <--", "-> $1.00 <-"},
};
const size_t punycode_examples_size = 19;
diff --git a/lib/wind/punycode_examples.h b/lib/wind/punycode_examples.h
index a9e527b0e803..3f4ced096b9e 100644
--- a/lib/wind/punycode_examples.h
+++ b/lib/wind/punycode_examples.h
@@ -1,5 +1,5 @@
/* ./punycode_examples.h */
-/* Automatically generated at 2017-12-08T03:21:15.326321 */
+/* Automatically generated at 2019-06-07T02:40:18.438347 */
#ifndef PUNYCODE_EXAMPLES_H
#define PUNYCODE_EXAMPLES_H 1
diff --git a/lib/wind/stringprep.py b/lib/wind/stringprep.py
index 249b1dc2a1ca..cff4d02a7b6d 100644
--- a/lib/wind/stringprep.py
+++ b/lib/wind/stringprep.py
@@ -57,7 +57,7 @@ def symbols(tabledict, tables):
list = list + tabledict.get(x, [])
if len(list) == 0:
return ""
- return "|".join(map(lambda x: "WIND_PROFILE_%s" % (string.upper(x)), list))
+ return "|".join(map(lambda x: "WIND_PROFILE_%s" % (x.upper()), list))
def get_errorlist():
d = dict()
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 20:01:14 +0000