@@ -3,6 +3,8 @@

 	* s3cmd: Enabled --dry-run and --exclude for 'put' and 'get'.

 	* S3/Exceptions.py: Remove DeprecationWarning about 

 	  BaseException.message in Python 2.6

+	* s3cmd: Rewritten gpg_command() to use subprocess.Popen()

+	  instead of os.popen4() deprecated in 2.6

 2009-01-22  Michal Ludvig  <michal@logix.cz>

@@ -15,6 +15,7 @@ import glob

 import traceback

 import codecs

 import locale

+import subprocess

 from copy import copy

 from optparse import OptionParser, Option, OptionValueError, IndentedHelpFormatter

@@ -1019,13 +1020,13 @@ def resolve_list(lst, args):

 	return retval

 def gpg_command(command, passphrase = ""):

-	p_in, p_out = os.popen4(command)

-	if command.count("--passphrase-fd"):

-		p_in.write(passphrase+"\n")

-		p_in.flush()

-	for line in p_out:

-		info(line.strip())

-	p_pid, p_exitcode = os.wait()

+	debug("GPG command: " + " ".join(command))

+	p = subprocess.Popen(command, stdin = subprocess.PIPE, stdout = subprocess.PIPE, stderr = subprocess.STDOUT)

+	p_stdout, p_stderr = p.communicate(passphrase + "\n")

+	debug("GPG output:")

+	for line in p_stdout.split("\n"):

+		debug("GPG: " + line)

+	p_exitcode = p.wait()

 	return p_exitcode

 def gpg_encrypt(filename):