From 2e90b6f308dc09bf1734f6cb5cc990cb8149486d Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 21 Nov 2022 16:59:21 -0800
Subject: [PATCH] cleanup python lib imports

---
 __init__.py        | 18 +++++++++---------
 python/__init__.py | 10 ++++------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/__init__.py b/__init__.py
index 6f8af2bd..b8d73caf 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1,10 +1,10 @@
-# flake8: noqa
-# pylint: skip-file
-from .python import Panda, PandaDFU, \
-                    BASEDIR, PandaSerial, pack_can_buffer, unpack_can_buffer, \
-                    DEFAULT_FW_FN, DEFAULT_H7_FW_FN, MCU_TYPE_H7, MCU_TYPE_F4, DLC_TO_LEN, LEN_TO_DLC, \
-                    ALTERNATIVE_EXPERIENCE
+from .python import (Panda, PandaDFU, # noqa: F401
+                     BASEDIR, pack_can_buffer, unpack_can_buffer,
+                     DEFAULT_FW_FN, DEFAULT_H7_FW_FN, MCU_TYPE_H7, MCU_TYPE_F4, DLC_TO_LEN, LEN_TO_DLC,
+                     ALTERNATIVE_EXPERIENCE)
 
-from .python.config import BOOTSTUB_ADDRESS, BLOCK_SIZE_FX, APP_ADDRESS_FX, \
-                           BLOCK_SIZE_H7, APP_ADDRESS_H7, DEVICE_SERIAL_NUMBER_ADDR_H7, \
-                           DEVICE_SERIAL_NUMBER_ADDR_FX
+from .python.serial import PandaSerial  # noqa: F401
+
+from .python.config import (BOOTSTUB_ADDRESS, BLOCK_SIZE_FX, APP_ADDRESS_FX,  # noqa: F401
+                            BLOCK_SIZE_H7, APP_ADDRESS_H7, DEVICE_SERIAL_NUMBER_ADDR_H7,  # noqa: F401
+                            DEVICE_SERIAL_NUMBER_ADDR_FX)
diff --git a/python/__init__.py b/python/__init__.py
index 07efeed4..27cb764b 100644
--- a/python/__init__.py
+++ b/python/__init__.py
@@ -13,10 +13,10 @@ from functools import wraps
 from typing import Optional
 from itertools import accumulate
 
-from .dfu import PandaDFU, MCU_TYPE_F2, MCU_TYPE_F4, MCU_TYPE_H7  # pylint: disable=import-error
-from .serial import PandaSerial  # noqa pylint: disable=import-error
-from .isotp import isotp_send, isotp_recv  # pylint: disable=import-error
-from .config import DEFAULT_FW_FN, DEFAULT_H7_FW_FN, SECTOR_SIZES_FX, SECTOR_SIZES_H7  # noqa pylint: disable=import-error
+from .config import DEFAULT_FW_FN, DEFAULT_H7_FW_FN, SECTOR_SIZES_FX, SECTOR_SIZES_H7
+from .dfu import PandaDFU, MCU_TYPE_F2, MCU_TYPE_F4, MCU_TYPE_H7
+from .isotp import isotp_send, isotp_recv
+from .spi import SpiHandle
 
 __version__ = '0.0.10'
 
@@ -254,8 +254,6 @@ class Panda:
     self._handle = None
 
     if self._spi:
-      # TODO: move this back. need to wait until next AGNOS build
-      from .spi import SpiHandle # noqa pylint: disable=import-error
       self._handle = SpiHandle()
 
       # TODO implement