summaryrefslogtreecommitdiff
path: root/src/leap/soledad/util.py
diff options
context:
space:
mode:
authorkali <kali@leap.se>2013-01-25 01:55:04 +0900
committerkali <kali@leap.se>2013-01-25 01:55:04 +0900
commitb9cba4bc7b88420e0ee46a6f03dd4aa2fb1edd1e (patch)
tree136fcde8955f00ac42ca2054a3108bd4bc0de064 /src/leap/soledad/util.py
parentb093b632049e1cf4c61d714c025831fb8d373ed7 (diff)
parentd02402a147bbae945618befdb8a1a260a91ce7a6 (diff)
Merge branch 'develop' of ssh://leap.se/leap_client into develop
Diffstat (limited to 'src/leap/soledad/util.py')
-rw-r--r--src/leap/soledad/util.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/leap/soledad/util.py b/src/leap/soledad/util.py
index 00625e86..4bc4d2c9 100644
--- a/src/leap/soledad/util.py
+++ b/src/leap/soledad/util.py
@@ -45,11 +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