From cdf505a50c107c14e626f308bd26eee9b4b9f305 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Wed, 20 Jul 2016 17:59:25 +0000
Subject: [PATCH] Make swift-oldies py3-compatible

Change-Id: I0388f4738966bc453e922e9598ff9df60ecda4eb
---
 bin/swift-oldies | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/bin/swift-oldies b/bin/swift-oldies
index 74854d78d8..53845c07e5 100755
--- a/bin/swift-oldies
+++ b/bin/swift-oldies
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from __future__ import print_function
 import optparse
 import subprocess
 import sys
@@ -30,16 +31,20 @@ Lists old Swift processes.
     listing = []
     for line in subprocess.Popen(
             ['ps', '-eo', 'etime,pid,args', '--no-headers'],
-            stdout=subprocess.PIPE).communicate()[0].split('\n'):
+            stdout=subprocess.PIPE).communicate()[0].split(b'\n'):
         if not line:
             continue
         hours = 0
         try:
-            etime, pid, args = line.split(None, 2)
+            etime, pid, args = line.decode('ascii').split(None, 2)
         except ValueError:
+            # This covers both decoding and not-enough-values-to-unpack errors
             sys.exit('Could not process ps line %r' % line)
-        if not args.startswith('/usr/bin/python /usr/bin/swift-') and \
-                not args.startswith('/usr/bin/python /usr/local/bin/swift-'):
+        if not args.startswith((
+                '/usr/bin/python /usr/bin/swift-',
+                '/usr/bin/python /usr/local/bin/swift-',
+                '/usr/bin/python3 /usr/bin/swift-',
+                '/usr/bin/python3 /usr/local/bin/swift-')):
             continue
         args = args.split('-', 1)[1]
         etime = etime.split('-')
@@ -70,8 +75,6 @@ Lists old Swift processes.
         args_len = max(args_len, len(args))
     args_len = min(args_len, 78 - hours_len - pid_len)
 
-    print ('%%%ds %%%ds %%s' % (hours_len, pid_len)) % \
-          ('Hours', 'PID', 'Command')
+    print('%*s %*s %s' % (hours_len, 'Hours', pid_len, 'PID', 'Command'))
     for hours, pid, args in listing:
-        print ('%%%ds %%%ds %%s' % (hours_len, pid_len)) % \
-              (hours, pid, args[:args_len])
+        print('%*s %*s %s' % (hours_len, hours, pid_len, pid, args[:args_len]))