From 265fa52600d1cb69a0a44e6b2d78561ea5a3a2af Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Mon, 4 Apr 2011 18:24:16 +0000 Subject: [PATCH] minor code cosmetics --- lib/request/basic.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/request/basic.py b/lib/request/basic.py index 29323b109..e4e9aec90 100644 --- a/lib/request/basic.py +++ b/lib/request/basic.py @@ -106,16 +106,18 @@ def checkCharEncoding(encoding): encoding = encoding.replace('8858', '8859') # iso-8858 -> iso-8859 elif '2313' in encoding: encoding = encoding.replace('2313', '2312') # gb2313 -> gb2312 + + # name adjustment for compatibility 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('cp-'): encoding = 'cp%s' % encoding[3:] elif encoding.startswith('windows') and not encoding.startswith('windows-'): encoding = 'windows-%s' % encoding[7:] + + # http://philip.html5.org/data/charsets-2.html + if encoding in translate: + encoding = translate[encoding] elif encoding == 'null': return None