From e5d040a2083156522fd548a0c5fd797f10bfa5f4 Mon Sep 17 00:00:00 2001 From: Mort Yao Date: Sat, 1 Sep 2012 09:27:03 +0200 Subject: [PATCH] print Unicode strings on codepage where possible --- you_get/common.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/you_get/common.py b/you_get/common.py index 9cd2d277..98ea7c7a 100644 --- a/you_get/common.py +++ b/you_get/common.py @@ -20,10 +20,11 @@ else: default_encoding = locale.getpreferredencoding().lower() def tr(s): - if default_encoding.startswith('utf') or default_encoding in ['cp936', '936', 'ms936', 'gbk']: + try: + s.encode(default_encoding) return s - else: - return s.encode('utf-8') + except: + return str(s.encode('utf-8'))[2:-1] def r1(pattern, text): m = re.search(pattern, text)