summaryrefslogtreecommitdiff
path: root/Lib/locale.py
diff options
context:
space:
mode:
authorMartin Panter <vadmium+py@gmail.com>2017-01-29 10:09:43 +0000
committerMartin Panter <vadmium+py@gmail.com>2017-01-29 10:09:43 +0000
commit6d1d733828b49eb03d45da81c6b8c6b849fbc5df (patch)
treeb0b120d6c527fb8cf6e4a0f175556611673ad780 /Lib/locale.py
parent357e8cdc9b1c5a99be9ade2b1070c38d50ddadc6 (diff)
parent23282e54fdd766945930006ab606641a2db37a4c (diff)
downloadcpython-6d1d733828b49eb03d45da81c6b8c6b849fbc5df.tar.gz
Issues #29349: Merge Py 2 fix 3.5
Diffstat (limited to 'Lib/locale.py')
-rw-r--r--Lib/locale.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/locale.py b/Lib/locale.py
index 6d59cd8bab..4de0090ed9 100644
--- a/Lib/locale.py
+++ b/Lib/locale.py
@@ -302,12 +302,16 @@ def str(val):
def delocalize(string):
"Parses a string as a normalized number according to the locale settings."
+
+ conv = localeconv()
+
#First, get rid of the grouping
- ts = localeconv()['thousands_sep']
+ ts = conv['thousands_sep']
if ts:
string = string.replace(ts, '')
+
#next, replace the decimal point with a dot
- dd = localeconv()['decimal_point']
+ dd = conv['decimal_point']
if dd:
string = string.replace(dd, '.')
return string