mdwsetup.py: Fixes for Python 3 compatibility.

[cfd] / mdwsetup.py

diff --git a/mdwsetup.py b/mdwsetup.py
index 94bce8a..385634d 100644 (file)
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -34,6 +34,13 @@ import distutils.core as DC
 import distutils.log as DL
 
 ###--------------------------------------------------------------------------
 import distutils.log as DL
 
 ###--------------------------------------------------------------------------

+### Compatibility hacks.
+
+def with_metaclass(meta, *supers):
+  return meta("#<anonymous base %s>" % meta.__name__,
+              supers or (object,), dict())
+
+###--------------------------------------------------------------------------

 ### Random utilities.
 
 def uniquify(seq):
 ### Random utilities.
 
 def uniquify(seq):


@@ -73,15 +80,16 @@ def progoutput(command):
   The COMMAND must produce exactly one line of output, and must exit with
   status zero.
   """
   The COMMAND must produce exactly one line of output, and must exit with
   status zero.
   """

-  kid = SUB.Popen(command, stdout = SUB.PIPE)
-  out = kid.stdout.readline()
-  junk = kid.stdout.read()
-  if junk != '':
-    raise ValueError, \
-          "Child process `%s' produced unspected output %r" % (command, junk)
+  kid = SUB.Popen(command, stdout = SUB.PIPE, universal_newlines = True)
+  try:
+    out = kid.stdout.readline()
+    junk = kid.stdout.read(1)
+  finally:
+    kid.stdout.close()
+  if junk != '': raise ValueError \
+    ("Child process `%s' produced unspected output %r" % (command, junk))

   rc = kid.wait()
   rc = kid.wait()

-  if rc != 0:
-    raise SubprocessFailure, (command, rc)
+  if rc != 0: raise SubprocessFailure(command, rc)

   return out.rstrip('\n')
 
 ###--------------------------------------------------------------------------
   return out.rstrip('\n')
 
 ###--------------------------------------------------------------------------


@@ -99,22 +107,24 @@ def pkg_config(pkg, version):
   library-directory names are in LIBDIRS; and the library names themselves
   are in LIBS.
   """
   library-directory names are in LIBDIRS; and the library names themselves
   are in LIBS.
   """

-  spec = '%s >= %s' % (pkg, version)
+

   def weird(what, word):
   def weird(what, word):

-    raise ValueError, \
-          "Unexpected `%s' item `%s' from package `%s'" % (what, word, pkg)
-  for word in progoutput(['pkg-config', '--cflags', spec]).split():
-    if word.startswith('-I'):
-      INCLUDEDIRS.append(word[2:])
-    else:
-      weird('--cflags', word)
-  for word in progoutput(['pkg-config', '--libs', spec]).split():
-    if word.startswith('-L'):
-      LIBDIRS.append(word[2:])
-    elif word.startswith('-l'):
-      LIBS.append(word[2:])
-    else:
-      weird('--libs', word)
+    raise ValueError \
+      ("Unexpected `%s' item `%s' from package `%s'" % (what, word, pkg))
+
+  spec = '%s >= %s' % (pkg, version)
+
+  try: cflags = OS.environ["%s_CFLAGS" % pkg]
+  except KeyError: cflags = progoutput(['pkg-config', '--cflags', spec])
+  for word in cflags.split():
+    if word.startswith('-I'): INCLUDEDIRS.append(word[2:])
+    else: weird('CFLAGS', word)
+  try: libs = OS.environ["%s_LIBS" % pkg]
+  except KeyError: libs = progoutput(['pkg-config', '--libs', spec])
+  for word in libs.split():
+    if word.startswith('-L'): LIBDIRS.append(word[2:])
+    elif word.startswith('-l'): LIBS.append(word[2:])
+    else: weird('LIBS', word)

 
 ###--------------------------------------------------------------------------
 ### Substituting variables in files.
 
 ###--------------------------------------------------------------------------
 ### Substituting variables in files.


@@ -181,7 +191,7 @@ class Generate (BaseGenFile):
     temp = me.target + '.new'
     with open(temp, 'w') as ft:
       rc = SUB.call([SYS.executable, me.sources[0]], stdout = ft)
     temp = me.target + '.new'
     with open(temp, 'w') as ft:
       rc = SUB.call([SYS.executable, me.sources[0]], stdout = ft)

-    if rc != 0: raise SubprocessFailure, (source, rc)
+    if rc != 0: raise SubprocessFailure(me.sources[0], rc << 8)

     OS.rename(temp, me.target)
 
 ## Backward compatibility.
     OS.rename(temp, me.target)
 
 ## Backward compatibility.


@@ -224,7 +234,7 @@ class CommandClass (type):
     else: CMDS[name] = c
     return c
 
     else: CMDS[name] = c
     return c
 

-class Command (DC.Command, object):
+class Command (with_metaclass(CommandClass, DC.Command, object)):

   """
   Base class for `mdwsetup' command classes.
 
   """
   Base class for `mdwsetup' command classes.
 


@@ -247,7 +257,7 @@ class distdir (Command):
   description = "print the distribution directory name to stdout"
   def run(me):
     d = me.distribution
   description = "print the distribution directory name to stdout"
   def run(me):
     d = me.distribution

-    print '%s-%s' % (d.get_name(), d.get_version())
+    print('%s-%s' % (d.get_name(), d.get_version()))

 
 class build_gen(Command):
   """
 
 class build_gen(Command):
   """