r22418 - /trunk/info.py -- March 06, 2014 - 18:09

Author: bugman
Date: Thu Mar  6 18:09:31 2014
New Revision: 22418

URL: http://svn.gna.org/viewcvs/relax?rev=22418&view=rev
Log:
Removed the dependence on subprocess.check_output() as this is only for 
Python 2.7 and higher.

This is for the relax information printout about the CPU info recently 
introduced.


Modified:
    trunk/info.py

Modified: trunk/info.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/info.py?rev=22418&r1=22417&r2=22418&view=diff
==============================================================================
--- trunk/info.py       (original)
+++ trunk/info.py       Thu Mar  6 18:09:31 2014
@@ -39,9 +39,9 @@
 from os import environ, pathsep, waitpid
 import platform
 from re import sub
-check_output, PIPE, Popen = None, None, None
+PIPE, Popen = None, None
 if dep_check.subprocess_module:
-    from subprocess import check_output, PIPE, Popen
+    from subprocess import PIPE, Popen
 import sys
 from textwrap import wrap
 
@@ -524,6 +524,10 @@
         @rtype:     str
         """
 
+        # Python 2.3 and earlier.
+        if Popen == None:
+            return ""
+
         # No subprocess module.
         if not dep_check.subprocess_module:
             return ""
@@ -534,14 +538,17 @@
         # Linux systems.
         if system == 'Linux':
             # The command to run.
-            command = "cat /proc/cpuinfo"
+            cmd = "cat /proc/cpuinfo"
 
             # Execute the command.
-            cpuinfo = check_output(command, shell=True).strip()
-            lines = cpuinfo.splitlines()
+            pipe = Popen(cmd, shell=True, stdout=PIPE, close_fds=False)
+            waitpid(pipe.pid, 0)
+
+            # Get the STDOUT data.
+            data = pipe.stdout.readlines()
 
             # Loop over the lines, returning the first model name with the 
leading "model name  :" text stripped.
-            for line in lines:
+            for line in data:
                 if "model name" in line:
                     # Convert the text.
                     name = sub(".*model name.*:", "", line, 1)
@@ -560,11 +567,21 @@
             environ['PATH'] += pathsep + '/usr/sbin'
 
             # The command to run.
-            command = "sysctl -n machdep.cpu.brand_string"
+            cmd = "sysctl -n machdep.cpu.brand_string"
 
             # Execute the command in a fail safe way, return the result or 
nothing.
             try:
-                return check_output(command).strip()
+                # Execute.
+                pipe = Popen(cmd, shell=True, stdout=PIPE, close_fds=False)
+                waitpid(pipe.pid, 0)
+
+                # Get the STDOUT data.
+                data = pipe.stdout.readlines()
+
+                # Return the string.
+                return data.strip()
+
+            # Nothing.
             except:
                 return ""