summaryrefslogtreecommitdiff
path: root/src/leap/soledad/util.py
diff options
context:
space:
mode:
authorantialias <antialias@leap.se>2013-01-24 11:38:18 -0500
committerantialias <antialias@leap.se>2013-01-24 11:38:18 -0500
commitcbdd369c00fda7e8d04dc2c422cbab9d5ad59c7d (patch)
tree9a18fefee8c22ea4341a7ff4b8b6d73f517820e4 /src/leap/soledad/util.py
parent66c40125df7c39d0a83cfa2fc2873de6bfbc7496 (diff)
parent1a9eb8218722ae64643c8e77f381c5609a89e18f (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