summaryrefslogtreecommitdiff
path: root/src/leap/soledad/__init__.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2012-12-27 03:09:34 +0900
committerkali <kali@leap.se>2012-12-27 03:09:34 +0900
commitb4af406e6cf233d939e3dfa5b5c9b2241b6d8ea0 (patch)
tree705a6648ca850000ed07fc65c9d03dc049a9784e /src/leap/soledad/__init__.py
parent1834c0e5207d3edb0002558715aaf30676e6d847 (diff)
import fixes for soledad
Diffstat (limited to 'src/leap/soledad/__init__.py')
-rw-r--r--src/leap/soledad/__init__.py11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/soledad/__init__.py b/src/leap/soledad/__init__.py
index 2caee108..c0146715 100644
--- a/src/leap/soledad/__init__.py
+++ b/src/leap/soledad/__init__.py
@@ -5,9 +5,11 @@
import os
import string
import random
-import cStringIO
+#import cStringIO
import hmac
-from util import GPGWrapper
+
+import util
+
class Soledad(object):
@@ -22,7 +24,7 @@ class Soledad(object):
os.makedirs(self.PREFIX)
if not gpghome:
gpghome = self.GNUPG_HOME
- self._gpg = GPGWrapper(gpghome=gpghome)
+ self._gpg = util.GPGWrapper(gpghome=gpghome)
# load/generate OpenPGP keypair
if not self._has_openpgp_keypair():
self._gen_openpgp_keypair()
@@ -156,3 +158,6 @@ class Soledad(object):
Synchronize with LEAP server.
"""
pass
+
+
+__all__ = ['util']