From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 1 Oct 2019 21:54:45 +0000 (+0100)
Subject: mdwsetup.py: Don't use the ancient `raise' syntax.
X-Git-Tag: 1.4.0~15
X-Git-Url: https://git.distorted.org.uk/~mdw/cfd/commitdiff_plain/207202a314beb383030b3feb979afec12a27d5ce

mdwsetup.py: Don't use the ancient `raise' syntax.
---

diff --git a/mdwsetup.py b/mdwsetup.py
index dfa217e..a1f56b6 100644
--- a/mdwsetup.py
+++ b/mdwsetup.py
@@ -76,12 +76,10 @@ def progoutput(command):
   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)
+  if junk != '': raise ValueError \
+    ("Child process `%s' produced unspected output %r" % (command, junk))
   rc = kid.wait()
-  if rc != 0:
-    raise SubprocessFailure, (command, rc)
+  if rc != 0: raise SubprocessFailure(command, rc)
   return out.rstrip('\n')
 
 ###--------------------------------------------------------------------------
@@ -101,8 +99,8 @@ def pkg_config(pkg, version):
   """
   spec = '%s >= %s' % (pkg, version)
   def weird(what, word):
-    raise ValueError, \
-          "Unexpected `%s' item `%s' from package `%s'" % (what, word, pkg)
+    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:])
@@ -181,7 +179,7 @@ class Generate (BaseGenFile):
     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, (me.sources[0], rc << 8)
+    if rc != 0: raise SubprocessFailure(me.sources[0], rc << 8)
     OS.rename(temp, me.target)
 
 ## Backward compatibility.