srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Revert "tools/file_import: restore sys.modules. Closes #976" 

This reverts commit b48e782dd6.
This commit is contained in:
Sebastien Bourdeauducq 2018-05-02 12:14:56 +08:00
parent 5f0cfadb30
commit 8d66d53e06
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
artiq/tools.py
View File

@ -6,7 +6,6 @@ import collections
import atexit import atexit
import string import string
import os import os
from copy import copy
import numpy as np import numpy as np
@ -85,12 +84,8 @@ def file_import(filename, prefix="file_import_"):
path = os.path.dirname(os.path.realpath(filename)) path = os.path.dirname(os.path.realpath(filename))
sys.path.insert(0, path) sys.path.insert(0, path)
try: try:
previous_modules = copy(sys.modules) loader = importlib.machinery.SourceFileLoader(modname, filename)
try: module = loader.load_module()
loader = importlib.machinery.SourceFileLoader(modname, filename)
module = loader.load_module()
finally:
sys.modules = previous_modules
finally: finally:
sys.path.remove(path) sys.path.remove(path)