Changeset 3303

Timestamp:

Mar 2, 2018 2:11:37 PM (4 years ago)

Author:

toby

Message:

Py3 fixes for svn self-update

File:

• trunk/GSASIIpath.py (modified) (12 diffs)

trunk/GSASIIpath.py

@@ -120 +120 @@
 svnLocCache = None
 'Cached location of svn to avoid multiple searches for it'
+
+def MakeByte2str(arg):
+    '''Convert output from subprocess pipes (bytes) to str (unicode) in Python 3.
+    In Python 2: Leaves output alone (already str). 
+    Leaves stuff of other types alone (including unicode in Py2)
+    Works recursively for string-like stuff in nested loops and tuples.
+
+    typical use::
+
+        out = MakeByte2str(out)
+
+    or::
+
+        out,err = MakeByte2str(s.communicate())
+    
+    '''
+    if isinstance(arg,str): return arg
+    if isinstance(arg,bytes): return arg.decode()
+    if isinstance(arg,list):
+        return [MakeByte2str(i) for i in arg]
+    if isinstance(arg,tuple):
+        return tuple([MakeByte2str(i) for i in arg])
+    return arg
+                
 def getsvnProxy():
     '''Loads a proxy for subversion from the file created by bootstrap.py
@@ -202 +226 @@
     s = subprocess.Popen(cmd,
                          stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print ('subversion error!\nout=%s'%out)
         print ('err=%s'%err)
         return None
-    return out.strip().decode()
+    return out.strip()
 
 def svnVersionNumber(svn=None):
@@ -244 +268 @@
     s = subprocess.Popen(cmd,
                          stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print ('out=%s'%out)
@@ -286 +310 @@
     if proxycmds: cmd += proxycmds
     s = subprocess.Popen(cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print ('svn failed\n%s'%out)
@@ -316 +340 @@
     s = subprocess.Popen(cmd,
                          stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err: return None
     x = ET.fromstring(out)
@@ -353 +377 @@
         print(s)
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print(60*"=")
@@ -375 +399 @@
     if proxycmds: cmd += proxycmds
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print("svn upgrade did not happen (this is probably OK). Messages:")
         print (err)
-            
+
 def svnUpdateProcess(version=None,projectfile=None,branch=None):
     '''perform an update of GSAS-II in a separate python process'''
@@ -426 +450 @@
     if verbose: print(u"Loading files to "+fpath+u"\n  from "+URL)
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = MakeByte2str(s.communicate())
     if err:
         print(60*"=")
@@ -454 +478 @@
     if proxycmds: cmd += proxycmds
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()   #this fails too easily
+    out,err = MakeByte2str(s.communicate())   #this fails too easily
     if err:
         print(60*"=")
@@ -500 +524 @@
         print(s)
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    res,err = p.communicate()
+    res,err = MakeByte2str(p.communicate())
     return res
 
@@ -523 +547 @@
         print(s)
     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    res,err = p.communicate()
+    res,err = MakeByte2str(p.communicate())
     versions = {}
-    for d in res.decode().split():
+    for d in res.split():
         if d.startswith(bindir):
             v = intver(d.rstrip('/').split('_')[3].lstrip('n'))
@@ -570 +594 @@
 #     if proxycmds: cmd += proxycmds
 #     p = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-#     res,err = p.communicate()
+#     res,err = MakeByte2str(p.communicate())
 #     for l in res.split('\n'):
 #         if "Relative URL:" in l: break