summaryrefslogtreecommitdiff
path: root/__init__.py
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-28 16:46:44 -0200
committerdrebs <drebs@leap.se>2013-01-28 16:46:44 -0200
commitb25360e22173a56e468b0285bae616491a1b67ca (patch)
tree436789bd977ec121e8ace28ae2ec97eb227ba21a /__init__.py
parent0a4548d55b22b21d5d54e88a0cd1e5b118b867f7 (diff)
Add CouchServerState for serving Soledad as WSGI app.
Diffstat (limited to '__init__.py')
-rw-r--r--__init__.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/__init__.py b/__init__.py
index c83627f0..2ed1a369 100644
--- a/__init__.py
+++ b/__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):