Revert "no more xx imports in tools"

This reverts commit 2de79769f0e7d29cc1e4f5544ae1681127ed3c5c.

old-commit-hash: 4a94e507cf
commatwo_master
Andy Haden 5 years ago
parent 6929d5b6e0
commit 03acf56736
  1. 5
      tools/lib/framereader.py
  2. 5
      tools/lib/logreader.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

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

Loading…
Cancel
Save