neale/moth
neale
/
moth
mirror of https://github.com/dirtbags/moth.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v3.5_devel' of https://github.com/dirtbags/moth into substring-answers

This commit is contained in:
John Donaldson 2020-03-10 21:32:12 +00:00
parent a963daa19a baafdd27a2
commit 8c1c68eea0
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/moth.py
View File

@ -27,6 +27,7 @@ def sha256hash(str):
@contextlib.contextmanager @contextlib.contextmanager
def pushd(newdir): def pushd(newdir):
newdir = str(newdir)
curdir = os.getcwd() curdir = os.getcwd()
LOGGER.debug("Attempting to chdir from %s to %s" % (curdir, newdir)) LOGGER.debug("Attempting to chdir from %s to %s" % (curdir, newdir))
os.chdir(newdir) os.chdir(newdir)
@ -273,7 +274,7 @@ class Puzzle:
elif key == "scripts" and isinstance(val, list): elif key == "scripts" and isinstance(val, list):
for script in val: for script in val:
stream = open(script, "rb") stream = open(script, "rb")
self.add_script_stream(stream, val) self.add_script_stream(stream, script)
elif key == "objective": elif key == "objective":
self.objective = val self.objective = val