Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/tools/python-yasm/pyxelator/work_unit.py

 #!/usr/bin/env python
 
 """ 
 
 (c) 2002, 2003, 2004, 2005 Simon Burton <simon@arrowtheory.com>
 Released under GNU LGPL license.
 
 version 0.xx
 
 """
 
 
 import sys
 import os
 
 import cparse
 import ir
 
+def callcmd(cmd):
+    try:
+        from subprocess import call
+        try:
+            retcode = call(cmd, shell=True)
+            assert retcode == 0, "command failed: %s"%cmd
+        except OSError, e:
+            assert False, "command failed: %s"%e
+    except ImportError:
+        status = os.system( cmd )
+        assert status == 0, "command failed: %s"%cmd
+
 class WorkUnit(object):
     def __init__(self, files, modname, filename,
                  std=False, strip=False, mark_cb=None, 
                  extradefs="", use_header=None, CC="gcc", CPP="gcc -E",
                  CPPFLAGS=""):
         self.files = tuple(files)
         self.modname = modname
         self.filename = filename
         self.CPPFLAGS = CPPFLAGS
         self.CPP = CPP
@@ skipping 26 matching lines @@
         for filename in self.files:
             if self.std:
                 line = '#include <%s>\n'%filename
             else:
                 line = '#include "%s"\n'%filename
             ifile.write( line )
             print line,
         ifile.close()
         cmd = '%s %s %s > %s'%(self.CPP,name+'.h',self.CPPFLAGS,name+'.E')
         sys.stderr.write( "# %s\n" % cmd )
-        status = os.system( cmd )
-        assert status == 0, "command failed: %s"%cmd
+        callcmd( cmd )
         assert open(name+'.E').read().count('\n') > 10, "failed to run preprocessor"
         cmd = '%s -dM %s %s > %s'%(self.CPP,name+'.h',self.CPPFLAGS,name+'.dM')
         sys.stderr.write( "# %s\n" % cmd )
-        status = os.system( cmd )
-        assert status == 0, "command failed: %s"%cmd
+        callcmd( cmd )
         assert open(name+'.dM').read().count('\n') > 10, "failed to run preprocessor with -dM"
         return name
 
     def parse(self, verbose=False):
         sys.stderr.write( "# parse %s\n" % str(self.files) )
         name = self.mkheader()
         # read macros
         f = open(name+'.dM')
         macros = {}
         for line in f.readlines():
@@ skipping 68 matching lines @@
                 if file_exists(path):
                     libnames.append(path)
                     break
             #else:
                 #print "cannot find %s lib as %s in %s" % ( lib, libname, libdir )
     print 'libnames:', libnames
     syms = {}
     accept = [ ' %s '%c for c in 'TVWBCDGRS' ]
     #f = open('syms.out','w')
     for libname in libnames:
-        fin, fout = os.popen2( 'nm %s' % libname )
+        try:
+            from subprocess import Popen, PIPE
+            p = Popen(['nm', libname], bufsize=1, stdout=PIPE)
+            fout = p.stdout
+        except ImportError:
+            fin, fout = os.popen2( 'nm %s' % libname )
         for line in fout.readlines():
             for acc in accept:
                 if line.count(acc):
                     left, right = line.split(acc)
                     sym = right.strip()
                     if sys.platform.count('darwin'):
                         if sym[0] == '_':
                             sym = sym[1:] # remove underscore prefix
                         if sym.endswith('.eh'):
                             sym = sym[:-len('.eh')]
                     syms[sym] = None
                     #f.write( '%s: %s %s\n' % (sym,line[:-1],libname) )
                     break
     return syms