Merge branch 'master' of github.com:satoshilabs/trezor-os

This commit is contained in:
slush0 2016-05-10 15:50:08 +02:00 committed by Pavol Rusnak
commit 4fec964a90
No known key found for this signature in database
GPG Key ID: 91F3B339B9A02A3D
3 changed files with 4 additions and 4 deletions

View File

@ -208,7 +208,7 @@ def layout_tap_to_confirm(address, amount, currency):
@unimport_func
def zprava():
from _io import BytesIO
from uio import BytesIO
from trezor.messages.GetAddress import GetAddress

View File

@ -2,7 +2,7 @@
# eigenein (c) 2011
# http://eigenein.me/protobuf/
from _io import BytesIO
from uio import BytesIO
import ustruct
# Types. -----------------------------------------------------------------------

View File

@ -1,4 +1,4 @@
import _io
import uio
import sys
import utime
@ -41,7 +41,7 @@ def error(name, msg, *args):
_log(name, ERROR, msg, *args)
def exception(name, exc):
out = _io.StringIO()
out = uio.StringIO()
sys.print_exception(exc, out)
_log(name, ERROR, out.getvalue())