Skip to content

Commit c8fe0ba

Browse files
committed
Make dependency checks less... crashy
1 parent d6df28c commit c8fe0ba

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lector/sorter.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@
4343

4444
from PyQt5 import QtCore, QtGui
4545
from lector import database
46-
47-
from lector.parsers.epub import ParseEPUB
48-
from lector.parsers.mobi import ParseMOBI
49-
from lector.parsers.fb2 import ParseFB2
5046
from lector.parsers.comicbooks import ParseCOMIC
5147

5248
logger = logging.getLogger(__name__)
@@ -69,7 +65,11 @@
6965
# python-lxml - Required for everything except comics
7066
lxml_check = importlib.util.find_spec('lxml')
7167
xmltodict_check = importlib.util.find_spec('xmltodict')
72-
if lxml_check:
68+
if lxml_check and xmltodict_check:
69+
from lector.parsers.epub import ParseEPUB
70+
from lector.parsers.mobi import ParseMOBI
71+
from lector.parsers.fb2 import ParseFB2
72+
7373
lxml_dependent = {
7474
'epub': ParseEPUB,
7575
'mobi': ParseMOBI,
@@ -81,7 +81,7 @@
8181
'fb2.zip': ParseFB2}
8282
sorter.update(lxml_dependent)
8383
else:
84-
critical_sting = 'python-lxml / xmltodict is not installed. Only comics will load.'
84+
critical_sting = 'lxml / xmltodict is not installed. Only comics will load.'
8585
print(critical_sting)
8686
logger.critical(critical_sting)
8787

0 commit comments

Comments
 (0)