From d22d9450562e823b626bbf44bb6ed9f3100afa91 Mon Sep 17 00:00:00 2001
From: Kevin Froman <beardog@firemail.cc>
Date: Fri, 26 Jan 2018 19:45:01 -0600
Subject: [PATCH] fixed wrong gnupg

---
 onionr/core.py        | 2 +-
 onionr/onionrutils.py | 5 +----
 requirements.txt      | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/onionr/core.py b/onionr/core.py
index 4709f051..40316760 100644
--- a/onionr/core.py
+++ b/onionr/core.py
@@ -49,7 +49,7 @@ class Core:
         ''' Generate the main PGP key for our client. Should not be done often.
         Uses own PGP home folder in the data/ directory. '''
         # Generate main pgp key
-        gpg = gnupg.GPG(gnupghome='./data/pgp/')
+        gpg = gnupg.GPG(homedir='./data/pgp/')
         input_data = gpg.gen_key_input(key_type="RSA", key_length=2048, name_real=myID, name_email='anon@onionr')
         #input_data = gpg.gen_key_input(key_type="RSA", key_length=1024)
         key = gpg.gen_key(input_data)
diff --git a/onionr/onionrutils.py b/onionr/onionrutils.py
index 29fe080e..d942d831 100644
--- a/onionr/onionrutils.py
+++ b/onionr/onionrutils.py
@@ -81,10 +81,7 @@ class OnionrUtils:
         '''Export our PGP key if it exists'''
         if not os.path.exists(self.fingerprintFile):
             raise Exception("No fingerprint found, cannot export our PGP key.")
-        if os.getenv('TRAVIS') == 'true':
-            gpg = gnupg.GPG(homedir='./data/pgp/')
-        else:
-            gpg = gnupg.GPG(gnupghome='./data/pgp/')
+        gpg = gnupg.GPG(homedir='./data/pgp/')
         with open(self.fingerprintFile,'r') as f:
             fingerprint = f.read()
         ascii_armored_public_keys = gpg.export_keys(fingerprint)
diff --git a/requirements.txt b/requirements.txt
index d09d9c70..ed2f5b23 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,5 @@ requests==2.18.4
 PyNaCl==1.2.1
 Flask==0.12.2
 pycrypto==2.6.1
-gnupg==0.4.1
+gnupg==2.3.1
 sha3==0.2.1