From 3aebd137b0f4c41e0dc4048a56b297a9fc94ee75 Mon Sep 17 00:00:00 2001
From: Dominik Kozaczko <dominik@kozaczko.info>
Date: Sat, 1 Oct 2016 09:50:03 +0200
Subject: [PATCH] removed .decode('ascii') and added missing bytestrings

---
 setup.py                    | 3 ++-
 tox.ini                     | 2 +-
 trezor_agent/factory.py     | 1 +
 trezor_agent/gpg/keyring.py | 9 +++++----
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/setup.py b/setup.py
index 1b134e3..1501fdc 100644
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,8 @@ setup(
     author_email='roman.zeyde@gmail.com',
     url='http://github.com/romanz/trezor-agent',
     packages=['trezor_agent', 'trezor_agent.gpg'],
-    install_requires=['ecdsa>=0.13', 'ed25519>=1.4', 'Cython>=0.23.4', 'protobuf>=3.0.0', 'trezor>=0.7.4', 'semver>=2.2'],
+    install_requires=['ecdsa>=0.13', 'ed25519>=1.4', 'Cython>=0.23.4', 'protobuf>=3.0.0', 'trezor>=0.7.4', 'semver>=2.2',
+                      'keepkey>=0.7.3'],
     platforms=['POSIX'],
     classifiers=[
         'Environment :: Console',
diff --git a/tox.ini b/tox.ini
index 7cd753f..83fd3bb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py34
+envlist = py27,py3
 [pep8]
 max-line-length = 100
 [testenv]
diff --git a/trezor_agent/factory.py b/trezor_agent/factory.py
index d000812..50da0f3 100644
--- a/trezor_agent/factory.py
+++ b/trezor_agent/factory.py
@@ -1,4 +1,5 @@
 """Thin wrapper around trezor/keepkey libraries."""
+from __future__ import absolute_import
 import binascii
 import collections
 import logging
diff --git a/trezor_agent/gpg/keyring.py b/trezor_agent/gpg/keyring.py
index f420fa2..eeea055 100644
--- a/trezor_agent/gpg/keyring.py
+++ b/trezor_agent/gpg/keyring.py
@@ -1,4 +1,5 @@
 """Tools for doing signature using gpg-agent."""
+from __future__ import unicode_literals, absolute_import, print_function
 
 import binascii
 import io
@@ -15,8 +16,8 @@ log = logging.getLogger(__name__)
 
 def get_agent_sock_path(sp=subprocess):
     """Parse gpgconf output to find out GPG agent UNIX socket path."""
-    lines = sp.check_output(['gpgconf', '--list-dirs']).strip().split('\n')
-    dirs = dict(line.split(':', 1) for line in lines)
+    lines = sp.check_output(['gpgconf', '--list-dirs']).strip().split(b'\n')
+    dirs = dict(line.split(b':', 1) for line in lines)
     return dirs['agent-socket']
 
 
@@ -183,14 +184,14 @@ def gpg_command(args, env=None):
 def get_keygrip(user_id, sp=subprocess):
     """Get a keygrip of the primary GPG key of the specified user."""
     args = gpg_command(['--list-keys', '--with-keygrip', user_id])
-    output = sp.check_output(args).decode('ascii')
+    output = sp.check_output(args)
     return re.findall(r'Keygrip = (\w+)', output)[0]
 
 
 def gpg_version(sp=subprocess):
     """Get a keygrip of the primary GPG key of the specified user."""
     args = gpg_command(['--version'])
-    output = sp.check_output(args).decode('ascii')
+    output = sp.check_output(args)
     line = output.split(b'\n')[0]  # b'gpg (GnuPG) 2.1.11'
     return line.split(b' ')[-1]  # b'2.1.11'