georep: python3 compatibility (Popen)

The file objects for python3 by default is opened
in binary mode where as in python2 it's opened
as text by default.

The geo-rep code parses the output of Popen assuming
it as text, hence used the 'universal_newlines' flag
which provides backward compatibility for the same.

Change-Id: I371a03b6348af9666164cb2e8b93d47475431ad9
Updates: #411
Signed-off-by: Kotresh HR <khiremat@redhat.com>
(cherry picked from commit 65aed1070cc2e44959cf3a0fbfde635de7e03103)

3 files changed, 21 insertions, 12 deletions

diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index 0c1b9818d2f..a0edeb7d56b 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -834,7 +834,8 @@ class Mounter(object):
 
     def umount_l(self, d):
         """perform lazy umount"""
-        po = Popen(self.make_umount_argv(d), stderr=subprocess.PIPE)
+        po = Popen(self.make_umount_argv(d), stderr=subprocess.PIPE,
+                   universal_newlines=True)
         po.wait()
         return po
 
@@ -956,7 +957,7 @@ class DirectMounter(Mounter):
 
     """mounter backend which calls mount(8), umount(8) directly"""
 
-    mountkw = {'stderr': subprocess.PIPE}
+    mountkw = {'stderr': subprocess.PIPE, 'universal_newlines': True}
     glusterprog = 'glusterfs'
 
     @staticmethod
@@ -979,7 +980,8 @@ class MountbrokerMounter(Mounter):
 
     """mounter backend using the mountbroker gluster service"""
 
-    mountkw = {'stderr': subprocess.PIPE, 'stdout': subprocess.PIPE}
+    mountkw = {'stderr': subprocess.PIPE, 'stdout': subprocess.PIPE,
+               'universal_newlines': True}
     glusterprog = 'gluster'
 
     @classmethod
@@ -1481,9 +1483,10 @@ class SSH(object):
             # Else rsync will write to stdout and nobody is their
             # to consume. If PIPE is full rsync hangs.
             po = Popen(argv, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
-                       stderr=subprocess.PIPE)
+                       stderr=subprocess.PIPE, universal_newlines=True)
         else:
-            po = Popen(argv, stdin=subprocess.PIPE, stderr=subprocess.PIPE)
+            po = Popen(argv, stdin=subprocess.PIPE, stderr=subprocess.PIPE,
+                       universal_newlines=True)
 
         for f in files:
             po.stdin.write(f)
@@ -1532,8 +1535,10 @@ class SSH(object):
             [host, "tar"] + \
             ["--overwrite", "-xf", "-", "-C", rdir]
         p0 = Popen(tar_cmd, stdout=subprocess.PIPE,
-                   stdin=subprocess.PIPE, stderr=subprocess.PIPE)
-        p1 = Popen(ssh_cmd, stdin=p0.stdout, stderr=subprocess.PIPE)
+                   stdin=subprocess.PIPE, stderr=subprocess.PIPE,
+                   universal_newlines=True)
+        p1 = Popen(ssh_cmd, stdin=p0.stdout, stderr=subprocess.PIPE,
+                   universal_newlines=True)
         for f in files:
             p0.stdin.write(f)
             p0.stdin.write('\n')
diff --git a/geo-replication/syncdaemon/subcmds.py b/geo-replication/syncdaemon/subcmds.py
index 11d263d7e03..30050ec4743 100644
--- a/geo-replication/syncdaemon/subcmds.py
+++ b/geo-replication/syncdaemon/subcmds.py
@@ -112,7 +112,8 @@ def subcmd_voluuidget(args):
 
     po = Popen(['gluster', '--xml', '--remote-host=' + args.host,
                 'volume', 'info', args.volname], bufsize=0,
-               stdin=None, stdout=PIPE, stderr=PIPE)
+               stdin=None, stdout=PIPE, stderr=PIPE,
+               universal_newlines=True)
 
     vix, err = po.communicate()
     if po.returncode != 0:
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index d13c1c82853..cbb169c6c96 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -263,7 +263,8 @@ def finalize(*args, **kwargs):
             umount_cmd = rconf.mbr_umount_cmd + [rconf.mount_point, 'lazy']
         else:
             umount_cmd = ['umount', '-l', rconf.mount_point]
-        p0 = subprocess.Popen(umount_cmd, stderr=subprocess.PIPE)
+        p0 = subprocess.Popen(umount_cmd, stderr=subprocess.PIPE,
+                              universal_newlines=True)
         _, errdata = p0.communicate()
         if p0.returncode == 0:
             try:
@@ -638,7 +639,8 @@ def unshare_propagation_supported():
     unshare_mnt_propagation = False
     p = subprocess.Popen(["unshare", "--help"],
                          stderr=subprocess.PIPE,
-                         stdout=subprocess.PIPE)
+                         stdout=subprocess.PIPE,
+                         universal_newlines=True)
     out, err = p.communicate()
     if p.returncode == 0:
         if "propagation" in out:
@@ -655,7 +657,8 @@ def get_rsync_version(rsync_cmd):
     rsync_version = "0"
     p = subprocess.Popen([rsync_cmd, "--version"],
                          stderr=subprocess.PIPE,
-                         stdout=subprocess.PIPE)
+                         stdout=subprocess.PIPE,
+                         universal_newlines=True)
     out, err = p.communicate()
     if p.returncode == 0:
         rsync_version = out.split(" ", 4)[3]
@@ -858,7 +861,7 @@ class Volinfo(object):
     def __init__(self, vol, host='localhost', prelude=[]):
         po = Popen(prelude + ['gluster', '--xml', '--remote-host=' + host,
                               'volume', 'info', vol],
-                   stdout=PIPE, stderr=PIPE)
+                   stdout=PIPE, stderr=PIPE, universal_newlines=True)
         vix = po.stdout.read()
         po.wait()
         po.terminate_geterr()