Run python-modernize fixers

[invirt/packages/invirt-base.git] / python / invirt / remctl.py

diff --git a/python/invirt/remctl.py b/python/invirt/remctl.py
index 465d31c..5466375 100644 (file)
--- a/python/invirt/remctl.py
+++ b/python/invirt/remctl.py
@@ -2,8 +2,11 @@
 Functions to perform remctls.
 """
 
 Functions to perform remctls.
 """
 

+from __future__ import absolute_import
+from __future__ import print_function

 from invirt.common import CodeError
 import subprocess
 from invirt.common import CodeError
 import subprocess

+import sys

 from socket import getfqdn
 
 def kinit(principal=None, keytab=None):
 from socket import getfqdn
 
 def kinit(principal=None, keytab=None):

@@ -34,11 +37,11 @@ def remctl(host, *args, **kws):
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)
                          + list(args),
                          stdout=subprocess.PIPE,
                          stderr=subprocess.PIPE)

-    v = p.wait()
+    stdout, stderr = p.communicate()

     if kws.get('err'):
     if kws.get('err'):

-        return p.stdout.read(), p.stderr.read()
-    if v:
-        print >> sys.stderr, 'Error', v, 'on remctl', args, ':'
-        print >> sys.stderr, p.stderr.read()
+        return stdout, stderr
+    if p.returncode:
+        print('Error', p.returncode, 'on remctl', args, ':', file=sys.stderr)
+        print(stderr, file=sys.stderr)

         raise CodeError('ERROR on remctl')
         raise CodeError('ERROR on remctl')

-    return p.stdout.read()
+    return stdout