scripts: Fixed openio issue where some scripts didn't import os
This only failed if "-" was used as an argument (for stdin/stdout), so the issue was pretty hard to spot. openio is a heavily copy-pasted function, so it makes sense to just add the import os to openio directly. Otherwise this mistake will likely happen again in the future.
This commit is contained in:
@@ -46,6 +46,7 @@ PERF_SCRIPT = ['./scripts/perf.py']
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ GIT_PATH = ['git']
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -157,6 +157,7 @@ class CodeResult(co.namedtuple('CodeResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -43,6 +43,7 @@ CTX_PATH = ['./scripts/ctx.py']
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -61,6 +61,7 @@ CTX_PATH = ['./scripts/ctx.py']
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -264,6 +264,7 @@ class CovResult(co.namedtuple('CovResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -12,6 +12,7 @@ import sys
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -1330,6 +1330,7 @@ def punescape_help():
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ class CtxResult(co.namedtuple('CtxResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -157,6 +157,7 @@ class DataResult(co.namedtuple('DataResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ import operator as op
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -182,6 +182,7 @@ class PerfResult(co.namedtuple('PerfResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -166,6 +166,7 @@ class PerfBdResult(co.namedtuple('PerfBdResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -134,6 +134,7 @@ def si2(x, w=5):
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ class AutoMultipleLocator(mpl.ticker.MultipleLocator):
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ L.lex('STUFF', '[^;{}?:,()"\'=!<>\-&|/#]+',
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -162,6 +162,7 @@ class StackResult(co.namedtuple('StackResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -160,6 +160,7 @@ class StructResult(co.namedtuple('StructResult', [
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ import time
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ import sys
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ PERF_SCRIPT = ['./scripts/perf.py']
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -46,6 +46,7 @@ CHARS_BRAILLE = (
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ CHARS_BRAILLE = (
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -53,6 +53,7 @@ FONT_SIZE = 10
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ except ModuleNotFoundError:
|
|||||||
|
|
||||||
def openio(path, mode='r', buffering=-1):
|
def openio(path, mode='r', buffering=-1):
|
||||||
# allow '-' for stdin/stdout
|
# allow '-' for stdin/stdout
|
||||||
|
import os
|
||||||
if path == '-':
|
if path == '-':
|
||||||
if 'r' in mode:
|
if 'r' in mode:
|
||||||
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
return os.fdopen(os.dup(sys.stdin.fileno()), mode, buffering)
|
||||||
|
|||||||
Reference in New Issue
Block a user