python3: fix thinkg again to get it working on python3.

deavid · May 9, 2015 · 2f46820 · 2f46820
1 parent eb18ac4
commit 2f46820
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/bjsonrpc/connection.py b/bjsonrpc/connection.py
@@ -49,8 +49,11 @@
 
 
 _log = logging.getLogger(__name__)
+try:
+    from BaseHTTPServer import BaseHTTPRequestHandler
+except ImportError:
+    from http.server import BaseHTTPRequestHandler
 
-from BaseHTTPServer import BaseHTTPRequestHandler
 from email.message import Message
 
 class HTTPRequest(BaseHTTPRequestHandler):
@@ -755,7 +758,7 @@ def write_line(self, data):
                 msg.add_header('Content-Length', str(len(data)))
                 msg.set_payload(data, charset='utf-8')
                 self._wbuffer += 'HTTP/1.0 200 OK\n'+msg.as_string()
-                print self._wbuffer
+                #print(self._wbuffer)
             else:
                 self._wbuffer += data + b'\n'
             sbytes = 0

diff --git a/bjsonrpc/serialsocket.py b/bjsonrpc/serialsocket.py
@@ -9,7 +9,7 @@
 
 """
 
-import serial
+#import serial
 
 class SerialSocket:
     def __init__(self, serial_port):