diff options
| author | drebs <drebs@leap.se> | 2013-01-28 16:46:44 -0200 |
|---|---|---|
| committer | drebs <drebs@leap.se> | 2013-01-28 16:46:44 -0200 |
| commit | eba89fb1d16b33fa65b49bbf7cc0109f4d4a6a65 (patch) | |
| tree | 8709d97513b0cce8f5842eb32b4a4a2ab372bf18 /src/leap/soledad/__init__.py | |
| parent | 159cda8564157fbb6247c04528f662b685995864 (diff) | |
Add CouchServerState for serving Soledad as WSGI app.
Diffstat (limited to 'src/leap/soledad/__init__.py')
| -rw-r--r-- | src/leap/soledad/__init__.py | 5 |
1 files changed, 2 insertions, 3 deletions
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): |