arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-04-29 05:29:03 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apps/playground/__init__.py
View File

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

2
src/lib/protobuf/protobuf.py
View File

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

4
src/trezor/log.py
View File

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