X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ticket.py;h=aa24b888d635a9c52a2abedb247789bc32373c18;hb=a869b6b1e66606b97fc654001275bb50b9f63206;hp=0292cfb12bae0f237a248feb8f10147c61f166c0;hpb=93de40749b82e4f24ea61e71714c780db9b1ff4c;p=nodemanager.git diff --git a/ticket.py b/ticket.py index 0292cfb..aa24b88 100644 --- a/ticket.py +++ b/ticket.py @@ -12,6 +12,10 @@ from xmlrpclib import dumps, loads GPG = '/usr/bin/gpg' +def _popen_gpg(*args): + """Return a Popen object to GPG.""" + return Popen((GPG, '--batch', '--no-tty') + args, + stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True) def sign(data): """Return signed with the default GPG key.""" @@ -33,11 +37,9 @@ def verify(signed_msg): msg = p.stdout.read() p.stdout.close() p.stderr.close() - if p.wait(): return None # verification failed + if p.wait(): + return None # verification failed else: data, = loads(msg)[0] return data -def _popen_gpg(*args): - """Return a Popen object to GPG.""" - return Popen((GPG, '--batch', '--no-tty') + args, stdin=PIPE, stdout=PIPE, stderr=PIPE, close_fds=True)