FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[3.14] gh-80667: Fix case-sensitivity of some Unicode literal escapes (GH-107281) by miss-islington · Pull Request #144753 · python/cpython · GitHub

Repository navigation

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension .c  (1) .py  (1) .rst  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
8 changes: 8 additions & 0 deletions Lib/test/test_ucn.py
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,9 @@ def test_hangul_syllables(self):
self.checkletter("HANGUL SYLLABLE HWEOK", "\ud6f8")
self.checkletter("HANGUL SYLLABLE HIH", "\ud7a3")

self.checkletter("haNGul SYllABle WAe", '\uc65c')
self.checkletter("HAngUL syLLabLE waE", '\uc65c')

self.assertRaises(ValueError, unicodedata.name, "\ud7a4")

def test_cjk_unified_ideographs(self):
Expand All @@ -103,6 +106,11 @@ def test_cjk_unified_ideographs(self):
self.checkletter("CJK UNIFIED IDEOGRAPH-2B81D", "\U0002B81D")
self.checkletter("CJK UNIFIED IDEOGRAPH-3134A", "\U0003134A")

self.checkletter("cjK UniFIeD idEogRAph-3aBc", "\u3abc")
self.checkletter("CJk uNIfiEd IDeOGraPH-3AbC", "\u3abc")
self.checkletter("cjK UniFIeD idEogRAph-2aBcD", "\U0002abcd")
self.checkletter("CJk uNIfiEd IDeOGraPH-2AbCd", "\U0002abcd")

def test_bmp_characters(self):
for code in range(0x10000):
char = chr(code)
Expand Down
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Literals using the ``\N{name}`` escape syntax can now construct CJK
ideographs and Hangul syllables using case-insensitive names.
15 changes: 8 additions & 7 deletions Modules/unicodedata.c
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Original file line number Diff line number Diff line change
Expand Up @@ -1362,7 +1362,7 @@ find_syllable(const char *str, int *len, int *pos, int count, int column)
len1 = Py_SAFE_DOWNCAST(strlen(s), size_t, int);
if (len1 <= *len)
continue;
if (strncmp(str, s, len1) == 0) {
if (PyOS_strnicmp(str, s, len1) == 0) {
*len = len1;
*pos = i;
}
Expand Down Expand Up @@ -1394,7 +1394,7 @@ _getcode(const char* name, int namelen, Py_UCS4* code)
* PUA */

/* Check for hangul syllables. */
if (strncmp(name, "HANGUL SYLLABLE ", 16) == 0) {
if (PyOS_strnicmp(name, "HANGUL SYLLABLE ", 16) == 0) {
int len, L = -1, V = -1, T = -1;
const char *pos = name + 16;
find_syllable(pos, &len, &L, LCount, 0);
Expand All @@ -1412,7 +1412,7 @@ _getcode(const char* name, int namelen, Py_UCS4* code)
}

/* Check for unified ideographs. */
if (strncmp(name, "CJK UNIFIED IDEOGRAPH-", 22) == 0) {
if (PyOS_strnicmp(name, "CJK UNIFIED IDEOGRAPH-", 22) == 0) {
/* Four or five hexdigits must follow. */
unsigned int v;
v = 0;
Expand All @@ -1422,10 +1422,11 @@ _getcode(const char* name, int namelen, Py_UCS4* code)
return 0;
while (namelen--) {
v *= 16;
if (*name >= '0' && *name <= '9')
v += *name - '0';
else if (*name >= 'A' && *name <= 'F')
v += *name - 'A' + 10;
Py_UCS1 c = Py_TOUPPER(*name);
if (c >= '0' && c <= '9')
v += c - '0';
else if (c >= 'A' && c <= 'F')
v += c - 'A' + 10;
else
return 0;
name++;
Expand Down
Loading

Back | FazBrowse Home | New Git URL