From 4a94e507cff94e55885e1b5efd2aa84bf642634d Mon Sep 17 00:00:00 2001 From: Andy Haden Date: Tue, 25 Feb 2020 11:36:02 -0800 Subject: [PATCH] Revert "no more xx imports in tools" This reverts commit 1f9485171edf2dded671d2e13aa8c8f60287bd5a. --- tools/lib/framereader.py | 5 ++++- tools/lib/logreader.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/lib/framereader.py b/tools/lib/framereader.py index 7c8628e342..8c17eaf005 100644 --- a/tools/lib/framereader.py +++ b/tools/lib/framereader.py @@ -25,7 +25,10 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from tools.lib.cache import cache_path_for_file_path from tools.lib.exceptions import DataUnreadableError -from tools.lib.filereader import FileReader +try: + from xx.chffr.lib.filereader import FileReader +except ImportError: + from tools.lib.filereader import FileReader from tools.lib.file_helpers import atomic_write_in_dir from tools.lib.mkvparse import mkvindex from tools.lib.route import Route diff --git a/tools/lib/logreader.py b/tools/lib/logreader.py index 85c1838ea1..4a41667192 100755 --- a/tools/lib/logreader.py +++ b/tools/lib/logreader.py @@ -11,7 +11,10 @@ import capnp import numpy as np from tools.lib.exceptions import DataUnreadableError -from tools.lib.filereader import FileReader +try: + from xx.chffr.lib.filereader import FileReader +except ImportError: + from tools.lib.filereader import FileReader from cereal import log as capnp_log OP_PATH = os.path.dirname(os.path.dirname(capnp_log.__file__))