From b4af406e6cf233d939e3dfa5b5c9b2241b6d8ea0 Mon Sep 17 00:00:00 2001
From: kali <kali@leap.se>
Date: Thu, 27 Dec 2012 03:09:34 +0900
Subject: import fixes for soledad

---
 src/leap/soledad/__init__.py | 11 ++++++++---
 1 file changed, 8 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 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']
-- 
cgit v1.2.3