From 762397854e90d0288081f0741fb742024217be8f Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Thu, 24 Mar 2011 09:27:19 +0000 Subject: [PATCH] fix for a bug reported by Kirill (unknown charset '8859-1') --- lib/request/basic.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/request/basic.py b/lib/request/basic.py index 315722d8d..2eac181c5 100644 --- a/lib/request/basic.py +++ b/lib/request/basic.py @@ -101,11 +101,15 @@ def checkCharEncoding(encoding): if delimiter in encoding: encoding = encoding[:encoding.find(delimiter)] + # popular typos/errors + if '8858' in encoding: + encoding = encoding.replace('8858', '8859') + if encoding.startswith('8859'): + encoding = 'iso-%s' % encoding + # http://philip.html5.org/data/charsets-2.html if encoding in translate: encoding = translate[encoding] - elif encoding.startswith('iso-8858'): #very popular typo - encoding = encoding.replace('8858', '8859') elif encoding.startswith('cp-'): encoding = 'cp%s' % encoding[3:] elif encoding.startswith('windows') and not encoding.startswith('windows-'):