Merge pull request #674 from cmonr/sterm-fixes-for-py3

sterm fixes for py3

Author: screamerbg

mbed/mbed.py

@@ -1779,7 +1779,7 @@ def formaturl(url, format="default"):
 # Wrapper for the MbedTermnal functionality
 def mbed_sterm(port, baudrate=9600, echo=True, reset=False, sterm=False):
     try:
-        from mbed_terminal import MbedTerminal
+        from .mbed_terminal import MbedTerminal
     except (IOError, ImportError, OSError):
         error("The serial terminal functionality requires that the 'mbed-terminal' python module is installed.\nYou can install mbed-terminal by running 'pip install mbed-terminal'.", 1)
 

mbed/mbed_terminal.py

@@ -1,5 +1,4 @@
-
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 # Copyright (c) 2016 ARM Limited, All Rights Reserved
 # SPDX-License-Identifier: Apache-2.0
@@ -43,7 +42,6 @@ def __init__(self, port, baudrate=9600, echo=True, timeout=10):
             self.serial.flush()
             self.serial.reset_input_buffer()
         except Exception as e:
-            print 'error'
             self.serial = None
             return False