summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrebs <drebs@leap.se>2013-01-24 12:38:54 -0200
committerdrebs <drebs@leap.se>2013-01-24 12:38:54 -0200
commite07024c40a9cf74a2df2ba671b0fc677f3cbcc85 (patch)
tree1fcbdf1791fd1a9e9fa611bc43338dbb9bfe5f71
parent71df5a4431bce607550eec4425f4fdfbdbfa2af7 (diff)
Fix GPGWrapper send_keys logging.
-rw-r--r--__init__.py5
-rw-r--r--util.py7
2 files changed, 3 insertions, 9 deletions
diff --git a/__init__.py b/__init__.py
index cbd4bb0d..c83627f0 100644
--- a/__init__.py
+++ b/__init__.py
@@ -46,11 +46,6 @@ class Soledad(object):
# Management of secret for symmetric encryption
#-------------------------------------------------------------------------
-
- #-------------------------------------------------------------------------
- # Management of secret for symmetric encryption
- #-------------------------------------------------------------------------
-
def _has_secret(self):
"""
Verify if secret for symmetric encryption exists on local encrypted
diff --git a/util.py b/util.py
index 319d28ab..4bc4d2c9 100644
--- a/util.py
+++ b/util.py
@@ -45,12 +45,11 @@ class GPGWrapper(gnupg.GPG):
Send keys to a keyserver
"""
result = self.result_map['list'](self)
- logger.debug('send_keys: %r', keyids)
- data = _make_binary_stream("", self.encoding)
+ gnupg.logger.debug('send_keys: %r', keyids)
+ data = gnupg._make_binary_stream("", self.encoding)
args = ['--keyserver', keyserver, '--send-keys']
args.extend(keyids)
self._handle_io(args, data, result, binary=True)
- logger.debug('send_keys result: %r', result.__dict__)
+ gnupg.logger.debug('send_keys result: %r', result.__dict__)
data.close()
return result
-