Commit 26f792f4 by Sheng

Use io.StringIO

parent 80e559db
import io
import logging import logging
import os.path import os.path
import socket import socket
import weakref
import uuid import uuid
import weakref
import paramiko import paramiko
import tornado.web import tornado.web
import tornado.websocket import tornado.websocket
from tornado.ioloop import IOLoop from tornado.ioloop import IOLoop
from tornado.options import define, options, parse_command_line from tornado.options import define, options, parse_command_line
try:
from cStringIO import StringIO
except ImportError:
from io import StringIO
define('address', default='127.0.0.1', help='listen address') define('address', default='127.0.0.1', help='listen address')
define('port', default=8888, help='listen port', type=int) define('port', default=8888, help='listen port', type=int)
...@@ -109,10 +105,7 @@ class IndexHandler(tornado.web.RequestHandler): ...@@ -109,10 +105,7 @@ class IndexHandler(tornado.web.RequestHandler):
if not password: if not password:
password = None password = None
try: spkey = io.StringIO(privatekey.decode('utf-8'))
spkey = StringIO(privatekey)
except TypeError:
spkey = StringIO(privatekey.decode('utf-8'))
try: try:
pkey = paramiko.RSAKey.from_private_key(spkey, password=password) pkey = paramiko.RSAKey.from_private_key(spkey, password=password)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment