Merge branch 'devel' of ssh://git.planet-lab.org/git/nodemanager into devel

[nodemanager.git] / ticket.py

diff --git a/ticket.py b/ticket.py
index b50a76e..0012908 100644 (file)
--- a/ticket.py
+++ b/ticket.py
@@ -1,3 +1,6 @@
+# $Id$
+# $URL$
+
 """An extremely simple interface to the signing/verifying capabilities
 of gnupg.
 
@@ -9,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 <data> signed with the default GPG key."""
@@ -30,11 +37,8 @@ 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)