Skip to content

Commit 622010d

Browse files
committed
Improve import error message
1 parent cb756ea commit 622010d

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

webware/Application.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,11 @@ def initSessions(self):
299299
module = importlib.import_module(moduleName)
300300
cls = getattr(module, className)
301301
if not isinstance(cls, type):
302-
raise ImportError
302+
raise ImportError(f'{cls!r} is not a type')
303303
self._sessionClass = cls
304-
except (ImportError, AttributeError):
304+
except (ImportError, AttributeError) as err:
305305
print(f"ERROR: Could not import Session class '{className}'"
306-
f" from module '{moduleName}'")
306+
f" from module '{moduleName}':\n{err}")
307307
self._sessionClass = None
308308
moduleName = setting('SessionStore')
309309
if moduleName in (
@@ -314,7 +314,7 @@ def initSessions(self):
314314
module = importlib.import_module(moduleName)
315315
cls = getattr(module, className)
316316
if not isinstance(cls, type):
317-
raise ImportError
317+
raise ImportError(f'{cls!r} is not a type')
318318
self._sessions = cls(self)
319319
except ImportError as err:
320320
print(f"ERROR: Could not import SessionStore class '{className}'"

webware/PickleRPCServlet.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,7 @@
44
import traceback
55
from time import time
66

7-
try:
8-
from pickle import dumps, PickleError
9-
except ImportError:
10-
from pickle import dumps, PickleError
7+
from pickle import dumps, PickleError
118

129
try:
1310
import zlib

0 commit comments

Comments
 (0)