pld-builder.new: PLD_Builder/gpg.py Encode to utf8 when talking via communi...

arekm arekm at pld-linux.org
Sat Feb 13 22:05:42 CET 2010


Author: arekm                        Date: Sat Feb 13 21:05:42 2010 GMT
Module: pld-builder.new               Tag: HEAD
---- Log message:
Encode to utf8 when talking via communicate().

---- Files affected:
pld-builder.new/PLD_Builder:
   gpg.py (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: pld-builder.new/PLD_Builder/gpg.py
diff -u pld-builder.new/PLD_Builder/gpg.py:1.22 pld-builder.new/PLD_Builder/gpg.py:1.23
--- pld-builder.new/PLD_Builder/gpg.py:1.22	Mon May 25 17:31:00 2009
+++ pld-builder.new/PLD_Builder/gpg.py	Sat Feb 13 22:05:37 2010
@@ -23,7 +23,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf)
+        d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
     except OSError, e:
         log.error("gnupg run, does gpg binary exist? : %s" % e)
         raise
@@ -55,7 +55,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--decrypt']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf)
+        d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
     except OSError, e:
         log.error("gnupg run failed, does gpg binary exist? : %s" % e)
         raise
@@ -78,7 +78,7 @@
     cmd = ['/usr/bin/gpg', '--batch', '--no-tty', '--clearsign']
     gpg_run = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, close_fds=True)
     try:
-        d_stdout, d_stderr = gpg_run.communicate(buf)
+        d_stdout, d_stderr = gpg_run.communicate(buf.encode('utf-8'))
     except OSError, e:
         log.error("gnupg signing failed, does gpg binary exist? : %s" % e)
         raise
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/gpg.py?r1=1.22&r2=1.23&f=u



More information about the pld-cvs-commit mailing list