aboutsummaryrefslogtreecommitdiff
path: root/catapult/devil/devil/utils/zip_utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'catapult/devil/devil/utils/zip_utils.py')
-rw-r--r--catapult/devil/devil/utils/zip_utils.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/catapult/devil/devil/utils/zip_utils.py b/catapult/devil/devil/utils/zip_utils.py
index 35c59056..aac9641e 100644
--- a/catapult/devil/devil/utils/zip_utils.py
+++ b/catapult/devil/devil/utils/zip_utils.py
@@ -9,18 +9,17 @@ import os
import sys
import zipfile
-_DEVIL_ROOT_DIR = os.path.abspath(
- os.path.join(os.path.dirname(__file__), '..', '..'))
if __name__ == '__main__':
+ _DEVIL_ROOT_DIR = os.path.abspath(
+ os.path.join(os.path.dirname(__file__), '..', '..'))
sys.path.append(_DEVIL_ROOT_DIR)
-_PY_UTILS_ROOT_DIR = os.path.abspath(
- os.path.join(_DEVIL_ROOT_DIR, '..', 'common', 'py_utils'))
-sys.path.append(_PY_UTILS_ROOT_DIR)
-
+from devil import devil_env
from devil import base_error
from devil.utils import cmd_helper
-from py_utils import tempfile_ext
+
+with devil_env.SysPath(devil_env.PY_UTILS_PATH):
+ from py_utils import tempfile_ext
logger = logging.getLogger(__name__)