From eba89fb1d16b33fa65b49bbf7cc0109f4d4a6a65 Mon Sep 17 00:00:00 2001
From: drebs <drebs@leap.se>
Date: Mon, 28 Jan 2013 16:46:44 -0200
Subject: Add CouchServerState for serving Soledad as WSGI app.

---
 src/leap/soledad/__init__.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/leap/soledad/__init__.py')

diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index c83627f0..2ed1a369 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -8,7 +8,6 @@ import random
 import hmac
 from leap.soledad.backends import sqlcipher
 from leap.soledad.util import GPGWrapper
-import util
 
 
 class Soledad(object):
@@ -28,7 +27,7 @@ class Soledad(object):
             os.makedirs(self.PREFIX)
         if not gpghome:
             gpghome = self.GNUPG_HOME
-        self._gpg = util.GPGWrapper(gpghome=gpghome)
+        self._gpg = GPGWrapper(gpghome=gpghome)
         # load/generate OpenPGP keypair
         if not self._has_openpgp_keypair():
             self._gen_openpgp_keypair()
@@ -64,7 +63,7 @@ class Soledad(object):
         try:
             with open(self.SECRET_PATH) as f:
                 self._secret = str(self._gpg.decrypt(f.read()))
-        except IOError as e:
+        except IOError:
             raise IOError('Failed to open secret file %s.' % self.SECRET_PATH)
 
     def _gen_secret(self):
-- 
cgit v1.2.3