no more xx imports in tools

pull/1123/head
Willem Melching 5 years ago
parent a475b1269d
commit 1f9485171e
  1. 5
      tools/lib/framereader.py
  2. 5
      tools/lib/logreader.py

@ -25,10 +25,7 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
from tools.lib.cache import cache_path_for_file_path from tools.lib.cache import cache_path_for_file_path
from tools.lib.exceptions import DataUnreadableError from tools.lib.exceptions import DataUnreadableError
try: from tools.lib.filereader import FileReader
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.file_helpers import atomic_write_in_dir
from tools.lib.mkvparse import mkvindex from tools.lib.mkvparse import mkvindex
from tools.lib.route import Route from tools.lib.route import Route

@ -11,10 +11,7 @@ import capnp
import numpy as np import numpy as np
from tools.lib.exceptions import DataUnreadableError from tools.lib.exceptions import DataUnreadableError
try: from tools.lib.filereader import FileReader
from xx.chffr.lib.filereader import FileReader
except ImportError:
from tools.lib.filereader import FileReader
from cereal import log as capnp_log from cereal import log as capnp_log
OP_PATH = os.path.dirname(os.path.dirname(capnp_log.__file__)) OP_PATH = os.path.dirname(os.path.dirname(capnp_log.__file__))

Loading…
Cancel
Save