jacobpascual/trezor-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util: move ASSUAN serialization to break circular import

Browse Source
This commit is contained in:
Roman Zeyde
2018-03-11 15:05:54 +02:00
parent 92c352e860
commit 0699273d49
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libagent/device/ui.py
View File

@@ -4,7 +4,7 @@ import logging
import os
import subprocess
from ..gpg import agent
from .. import util
log = logging.getLogger(__name__)
@@ -93,17 +93,17 @@ def interact(title, description, prompt, binary, options):
env=os.environ)
expect(p, [b'OK'])
title = agent.serialize(title.encode('ascii'))
title = util.assuan_serialize(title.encode('ascii'))
write(p, b'SETTITLE ' + title + b'\n')
expect(p, [b'OK'])
if description:
description = agent.serialize(description.encode('ascii'))
description = util.assuan_serialize(description.encode('ascii'))
write(p, b'SETDESC ' + description + b'\n')
expect(p, [b'OK'])
if prompt:
prompt = agent.serialize(prompt.encode('ascii'))
prompt = util.assuan_serialize(prompt.encode('ascii'))
write(p, b'SETPROMPT ' + prompt + b'\n')
expect(p, [b'OK'])