fix exception path

DomAmato · DomAmato · commit 6d0c28329802 · 2020-07-14T18:47:57.000-05:00
diff --git a/Hologram/Api.py b/Hologram/Api.py
@@ -9,7 +9,7 @@
 import logging
 from logging import NullHandler
 
-from Hologram.Exceptions.HologramError import ApiError
+from Hologram.Exceptions import ApiError
 import requests
 
 HOLOGRAM_REST_API_BASEURL = 'https://dashboard.hologram.io/api/1'
diff --git a/Hologram/Authentication/CSRPSKAuthentication.py b/Hologram/Authentication/CSRPSKAuthentication.py
@@ -9,7 +9,7 @@
 # LICENSE: Distributed under the terms of the MIT License
 #
 import json
-from Hologram.Exceptions.HologramError import AuthenticationError
+from Hologram.Exceptions import AuthenticationError
 from Hologram.Authentication.HologramAuthentication import HologramAuthentication
 
 DEVICE_KEY_LEN = 8
diff --git a/Hologram/CustomCloud.py b/Hologram/CustomCloud.py
@@ -11,7 +11,7 @@
 import socket
 import threading
 from Hologram.Cloud import Cloud
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 
 MAX_RECEIVE_BYTES = 1024
 MAX_QUEUED_CONNECTIONS = 5
diff --git a/Hologram/HologramCloud.py b/Hologram/HologramCloud.py
@@ -14,7 +14,7 @@
 from Hologram.CustomCloud import CustomCloud
 from HologramAuth import TOTPAuthentication, SIMOTPAuthentication
 from Hologram.Authentication import CSRPSKAuthentication
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 
 DEFAULT_SEND_MESSAGE_TIMEOUT = 5
 HOLOGRAM_HOST_SEND = 'cloudsocket.hologram.io'
diff --git a/Hologram/Modem/Quectel/BG96.py b/Hologram/Modem/Quectel/BG96.py
@@ -15,7 +15,7 @@
 from Hologram.Modem import Modem
 from Hologram.Event import Event
 from Hologram.Utils import ModemResult
-from Hologram.Exceptions.HologramError import SerialError, NetworkError
+from Hologram.Exceptions import SerialError, NetworkError
 
 DEFAULT_BG96_TIMEOUT = 200
 
diff --git a/Hologram/Modem/UBlox/Nova.py b/Hologram/Modem/UBlox/Nova.py
@@ -10,7 +10,7 @@
 
 from Hologram.Modem import Modem
 from Hologram.Utils import ModemResult
-from Hologram.Exceptions.HologramError import NetworkError
+from Hologram.Exceptions import NetworkError
 from Hologram.Event import Event
 
 import time
diff --git a/Hologram/Modem/UBlox/NovaM.py b/Hologram/Modem/UBlox/NovaM.py
@@ -10,7 +10,7 @@
 
 from Hologram.Modem.UBlox.Nova import Nova
 from Hologram.Event import Event
-from Hologram.Exceptions.HologramError import NetworkError
+from Hologram.Exceptions import NetworkError
 from Hologram.Utils import ModemResult
 
 DEFAULT_NOVAM_TIMEOUT = 200
diff --git a/Hologram/Modem/UBlox/Nova_U201.py b/Hologram/Modem/UBlox/Nova_U201.py
@@ -9,7 +9,7 @@
 #
 
 from Hologram.Modem.UBlox.Nova import Nova
-from Hologram.Exceptions.HologramError import SerialError
+from Hologram.Exceptions import SerialError
 from Hologram.Event import Event
 from Hologram.Utils import Location
 from Hologram.Utils import ModemResult
diff --git a/Hologram/Modem/__init__.py b/Hologram/Modem/__init__.py
@@ -11,7 +11,7 @@
 from Hologram.Utils import ModemResult
 from Hologram.Utils import SMS
 from Hologram.Event import Event
-from Hologram.Exceptions.HologramError import SerialError, HologramError, NetworkError, PPPError
+from Hologram.Exceptions import SerialError, HologramError, NetworkError, PPPError
 
 
 from collections import deque
diff --git a/Hologram/Network.py b/Hologram/Network.py
@@ -9,7 +9,7 @@
 #
 
 from Hologram.Event import Event
-from Hologram.Exceptions.HologramError import NetworkError
+from Hologram.Exceptions import NetworkError
 from Hologram.Utils.Route import Route
 from Hologram.Modem import Modem, DriverLoader
 from Hologram.Modem.Huawei import E303, MS2131, E372
diff --git a/Hologram/PPP/PPP.py b/Hologram/PPP/PPP.py
@@ -11,7 +11,7 @@
 from Hologram.PPP.pppd import PPPConnection
 from Hologram.PPP import IPPP
 from Hologram.Utils.Route import Route
-from Hologram.Exceptions.HologramError import PPPError
+from Hologram.Exceptions import PPPError
 
 DEFAULT_PPP_TIMEOUT = 200
 DEFAULT_PPP_INTERFACE = 'ppp0'
diff --git a/Hologram/PPP/pppd.py b/Hologram/PPP/pppd.py
@@ -17,7 +17,7 @@
 import threading
 import errno
 from subprocess import Popen, PIPE, STDOUT
-from Hologram.Exceptions.HologramError import PPPError, PPPConnectionError
+from Hologram.Exceptions import PPPError, PPPConnectionError
 
 
 __version__ = '1.0.3'
diff --git a/scripts/hologram b/scripts/hologram
@@ -14,7 +14,7 @@ from argparse import RawTextHelpFormatter
 import logging
 import sys
 from Hologram.CustomCloud import CustomCloud
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 
 from scripts.hologram_send import parse_hologram_send_args
 from scripts.hologram_send import run_hologram_send
diff --git a/scripts/hologram_activate.py b/scripts/hologram_activate.py
@@ -17,7 +17,7 @@
 
 from Hologram.HologramCloud import HologramCloud
 from Hologram.Api import Api
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 from .hologram_util import VAction
 
 CHECK_LIVE_SIM_STATE_MAX_TIMEOUT = 120 # 2 mins for max timeout
diff --git a/scripts/hologram_modem.py b/scripts/hologram_modem.py
@@ -9,7 +9,7 @@
 # LICENSE: Distributed under the terms of the MIT License
 
 from Hologram.CustomCloud import CustomCloud
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 from .hologram_util import handle_timeout
 from .hologram_util import VAction
 import json
diff --git a/scripts/hologram_network.py b/scripts/hologram_network.py
@@ -9,7 +9,7 @@
 # LICENSE: Distributed under the terms of the MIT License
 
 from Hologram.CustomCloud import CustomCloud
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 from .hologram_util import VAction
 import psutil
 
diff --git a/scripts/hologram_send.py b/scripts/hologram_send.py
@@ -12,7 +12,7 @@
 
 from Hologram.CustomCloud import CustomCloud
 from Hologram.HologramCloud import HologramCloud
-from Hologram.Exceptions.HologramError import HologramError
+from Hologram.Exceptions import HologramError
 from .hologram_util import VAction
 
 import argparse
diff --git a/tests/Modem/test_Modem.py b/tests/Modem/test_Modem.py
@@ -13,7 +13,7 @@
 sys.path.append(".")
 sys.path.append("..")
 sys.path.append("../..")
-from Hologram.Exceptions.HologramError import SerialError
+from Hologram.Exceptions import SerialError
 from Hologram.Modem import Modem
 from Hologram.Utils import ModemResult
 

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`# LICENSE: Distributed under the terms of the MIT License`
`10`	`10`	`#`
`11`	`11`	`import json`
`12`		`-from Hologram.Exceptions.HologramError import AuthenticationError`
	`12`	`+from Hologram.Exceptions import AuthenticationError`
`13`	`13`	`from Hologram.Authentication.HologramAuthentication import HologramAuthentication`
`14`	`14`
`15`	`15`	`DEVICE_KEY_LEN = 8`