Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
4cfae027
Commit
4cfae027
authored
Jul 24, 2011
by
Antoine Pitrou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #1813: Fix codec lookup and setting/getting locales under Turkish locales.
parent
a620facc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
2 deletions
+39
-2
Lib/locale.py
Lib/locale.py
+8
-1
Lib/test/test_codecs.py
Lib/test/test_codecs.py
+14
-0
Lib/test/test_locale.py
Lib/test/test_locale.py
+13
-0
Misc/NEWS
Misc/NEWS
+3
-0
Python/codecs.c
Python/codecs.c
+1
-1
No files found.
Lib/locale.py
View file @
4cfae027
...
...
@@ -331,6 +331,13 @@ def _test():
# overridden below)
_setlocale
=
setlocale
# Avoid relying on the locale-dependent .lower() method
# (see issue #1813).
_ascii_lower_map
=
''
.
join
(
chr
(
x
+
32
if
x
>=
ord
(
'A'
)
and
x
<=
ord
(
'Z'
)
else
x
)
for
x
in
range
(
256
)
)
def
normalize
(
localename
):
""" Returns a normalized locale code for the given locale
...
...
@@ -348,7 +355,7 @@ def normalize(localename):
"""
# Normalize the locale name and extract the encoding
fullname
=
localename
.
lower
(
)
fullname
=
localename
.
translate
(
_ascii_lower_map
)
if
':'
in
fullname
:
# ':' is sometimes used as encoding delimiter.
fullname
=
fullname
.
replace
(
':'
,
'.'
)
...
...
Lib/test/test_codecs.py
View file @
4cfae027
from
test
import
test_support
import
unittest
import
codecs
import
locale
import
sys
,
StringIO
,
_testcapi
class
Queue
(
object
):
...
...
@@ -1153,6 +1154,19 @@ class CodecsModuleTest(unittest.TestCase):
self
.
assertRaises
(
TypeError
,
codecs
.
getwriter
)
self
.
assertRaises
(
LookupError
,
codecs
.
getwriter
,
"__spam__"
)
def
test_lookup_issue1813
(
self
):
# Issue #1813: under Turkish locales, lookup of some codecs failed
# because 'I' is lowercased as a dotless "i"
oldlocale
=
locale
.
getlocale
(
locale
.
LC_CTYPE
)
self
.
addCleanup
(
locale
.
setlocale
,
locale
.
LC_CTYPE
,
oldlocale
)
try
:
locale
.
setlocale
(
locale
.
LC_CTYPE
,
'tr_TR'
)
except
locale
.
Error
:
# Unsupported locale on this system
self
.
skipTest
(
'test needs Turkish locale'
)
c
=
codecs
.
lookup
(
'ASCII'
)
self
.
assertEqual
(
c
.
name
,
'ascii'
)
class
StreamReaderTest
(
unittest
.
TestCase
):
def
setUp
(
self
):
...
...
Lib/test/test_locale.py
View file @
4cfae027
...
...
@@ -396,6 +396,19 @@ class TestMiscellaneous(unittest.TestCase):
# crasher from bug #7419
self
.
assertRaises
(
locale
.
Error
,
locale
.
setlocale
,
12345
)
def
test_getsetlocale_issue1813
(
self
):
# Issue #1813: setting and getting the locale under a Turkish locale
oldlocale
=
locale
.
getlocale
()
self
.
addCleanup
(
locale
.
setlocale
,
locale
.
LC_CTYPE
,
oldlocale
)
try
:
locale
.
setlocale
(
locale
.
LC_CTYPE
,
'tr_TR'
)
except
locale
.
Error
:
# Unsupported locale on this system
self
.
skipTest
(
'test needs Turkish locale'
)
loc
=
locale
.
getlocale
()
locale
.
setlocale
(
locale
.
LC_CTYPE
,
loc
)
self
.
assertEqual
(
loc
,
locale
.
getlocale
())
def
test_main
():
tests
=
[
...
...
Misc/NEWS
View file @
4cfae027
...
...
@@ -37,6 +37,9 @@ Core and Builtins
Library
-------
- Issue #1813: Fix codec lookup and setting/getting locales under Turkish
locales.
- Issue #10883: Fix socket leaks in urllib when using FTP.
- Issue #12592: Make Python build on OpenBSD 5 (and future major releases).
...
...
Python/codecs.c
View file @
4cfae027
...
...
@@ -70,7 +70,7 @@ PyObject *normalizestring(const char *string)
if
(
ch
==
' '
)
ch
=
'-'
;
else
ch
=
tolower
(
Py_CHARMASK
(
ch
));
ch
=
Py_TOLOWER
(
Py_CHARMASK
(
ch
));
p
[
i
]
=
ch
;
}
return
v
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment