github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

delete_require_chardet

pull/123/head
liuzheng712 2016-03-18 17:08:15 +08:00
parent 3ccf7adac1
commit 5af9dd655e
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
install/requirements.txt
View File

@ -15,4 +15,3 @@ pyinotify==0.9.6
passlib==1.6.5 passlib==1.6.5
argparse==1.4.0 argparse==1.4.0
django_crontab==0.6.0 django_crontab==0.6.0
chardet==2.3.0

4
run_server.py
View File

@ -10,7 +10,6 @@ import os.path
import threading import threading
import re import re
import functools import functools
import chardet
from django.core.signals import request_started, request_finished from django.core.signals import request_started, request_finished
import tornado.ioloop import tornado.ioloop
@ -412,9 +411,6 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
if self.term.vim_flag: if self.term.vim_flag:
self.term.vim_data += recv self.term.vim_data += recv
try: try:
# print chardet.detect(data)
# if chardet.detect(data)['encoding'] == 'GB2312':
# data = data.decode('gb2312').encode('utf8')
self.write_message(data.decode('utf-8', 'replace')) self.write_message(data.decode('utf-8', 'replace'))
now_timestamp = time.time() now_timestamp = time.time()
self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data))) self.log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(data)))