From 7f669b57891ab8f73acb908ae45fbef79570cfaa Mon Sep 17 00:00:00 2001 From: plt Date: Thu, 19 Jul 2012 15:51:52 +0800 Subject: [PATCH] Fix utf8 chinese decode bug --- views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views.py b/views.py index 39acebf1e8..128502d504 100644 --- a/views.py +++ b/views.py @@ -943,10 +943,10 @@ def repo_file_get(request, repo_id): else: l, d = [], {} try: + u_content = content.decode('utf-8') + except: # XXX: file in windows is encoded in gbk u_content = content.decode('gbk') - except: - u_content = content.decode('utf-8') from django.utils.html import escape d['content'] = re.sub("\r\n|\n", "
", escape(u_content)) l.append(d)