openstack/deb-python-websocket-client
Code Issues Proposed changes

Py3 fixes for wsdump.

Browse Source
This commit is contained in:
Ralph Bean
2014-04-14 19:49:12 -04:00
parent 80943475e5
commit b1b6b13a90
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
bin/wsdump.py
View File

@@ -2,6 +2,7 @@
import argparse import argparse
import code import code
import six
import sys import sys
import threading import threading
import websocket import websocket
@@ -45,11 +46,15 @@ class InteractiveConsole(code.InteractiveConsole):
sys.stdout.flush() sys.stdout.flush()
def raw_input(self, prompt): def raw_input(self, prompt):
line = raw_input(prompt) if six.PY3:
if ENCODING and ENCODING != "utf-8" and not isinstance(line, unicode): line = input(prompt)
else:
line = raw_input(prompt)
if ENCODING and ENCODING != "utf-8" and not isinstance(line, six.text_type):
line = line.decode(ENCODING).encode("utf-8") line = line.decode(ENCODING).encode("utf-8")
elif isinstance(line, unicode): elif isinstance(line, six.text_type):
line = encode("utf-8") line = line.encode("utf-8")
return line return line