REV: 96727cf

This is a Python 2 script, and will remain so for some time.

Instead of simply reverting the commit, use try/except to find the
proper way to import which.

Author: DimitriPapadopoulos

numpy/linalg/lapack_lite/clapack_scrub.py

@@ -3,11 +3,15 @@
 import os
 import re
 import sys
-from io import StringIO
 
 from plex import Scanner, Str, Lexicon, Opt, Bol, State, AnyChar, TEXT, IGNORE
 from plex.traditional import re as Re
 
+try:
+    from io import BytesIO as UStringIO  # Python 2
+except ImportError:
+    from io import StringIO as UStringIO  # Python 3
+
 
 class MyScanner(Scanner):
     def __init__(self, info, name='<default>'):
@@ -23,8 +27,8 @@ def sep_seq(sequence, sep):
     return pat
 
 def runScanner(data, scanner_class, lexicon=None):
-    info = StringIO(data)
-    outfo = StringIO()
+    info = UStringIO(data)
+    outfo = UStringIO()
     if lexicon is not None:
         scanner = scanner_class(lexicon, info)
     else:
@@ -191,7 +195,7 @@ def HaveBlankLines(line):
             return SourceLines
 
     state = SourceLines
-    for line in StringIO(source):
+    for line in UStringIO(source):
         state = state(line)
     comments.flushTo(lines)
     return lines.getValue()
@@ -219,7 +223,7 @@ def OutOfHeader(line):
         return OutOfHeader
 
     state = LookingForHeader
-    for line in StringIO(source):
+    for line in UStringIO(source):
         state = state(line)
     return lines.getValue()
 
@@ -228,7 +232,7 @@ def removeSubroutinePrototypes(source):
         r'/\* Subroutine \*/^\s*(?:(?:inline|static)\s+){0,2}(?!else|typedef|return)\w+\s+\*?\s*(\w+)\s*\([^0]+\)\s*;?'
     )
     lines = LineQueue()
-    for line in StringIO(source):
+    for line in UStringIO(source):
         if not expression.match(line):
             lines.add(line)
 
@@ -250,7 +254,7 @@ def InBuiltInFunctions(line):
             return InBuiltInFunctions
 
     state = LookingForBuiltinFunctions
-    for line in StringIO(source):
+    for line in UStringIO(source):
         state = state(line)
     return lines.getValue()
 

numpy/linalg/lapack_lite/make_lite.py

@@ -21,7 +21,10 @@
 import fortran
 import clapack_scrub
 
-from shutil import which
+try:
+    from distutils.spawn import find_executable as which  # Python 2
+except ImportError:
+    from shutil import which  # Python 3
 
 # Arguments to pass to f2c. You'll always want -A for ANSI C prototypes
 # Others of interest: -a to not make variables static by default