spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "no more xx imports in tools" 

This reverts commit 1f9485171e.
pull/1123/head
Andy Haden 2020-02-25 11:36:02 -08:00
parent 1f9485171e
commit 4a94e507cf
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/lib/framereader.py
View File

@ -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

5
tools/lib/logreader.py
View File

@ -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__))