Skip to content

Commit

Permalink
[SCons] Fix type reference and missing import
Browse files Browse the repository at this point in the history
In #1012, normapth was no longer exported from buildutils, but I missed
adding that import in the builder for python_minimal. In addition, Dict
is only available while type checking in buildutils, so it should be
quoted as a forward reference.
  • Loading branch information
bryanwweber authored and speth committed Jun 13, 2021
1 parent 4945645 commit 9f2e5c7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion interfaces/python_minimal/SConscript
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Minimal Python Module"""
from os.path import join as pjoin
from os.path import join as pjoin, normpath
from buildutils import *

Import('env', 'build', 'install')
Expand Down
2 changes: 1 addition & 1 deletion site_scons/buildutils.py
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ def get_spawn(env: "SCEnvironment"):
if "cmd.exe" not in env["SHELL"] or env.subst("$CXX") == "cl":
return env["SPAWN"]

def our_spawn(sh: str, escape: str, cmd: str, args: str, environ: Dict[str, str]):
def our_spawn(sh: str, escape: str, cmd: str, args: str, environ: "Dict[str, str]"):
newargs = " ".join(args[1:])
cmdline = cmd + " " + newargs
startupinfo = subprocess.STARTUPINFO() # type: ignore
Expand Down

0 comments on commit 9f2e5c7

Please sign in to comment.