Skip to content

Commit

Permalink
Conditionally import Qubes or Containers deps.
Browse files Browse the repository at this point in the history
Solves issues like these:

	ImportError while loading conftest '/home/user/dangerzone/tests/conftest.py'.
	tests/__init__.py:8: in <module>
	    from dangerzone.document import SAFE_EXTENSION
	dangerzone/__init__.py:16: in <module>
	    from .gui import gui_main as main
	dangerzone/gui/__init__.py:28: in <module>
	    from ..isolation_provider.qubes import Qubes, is_qubes_native_conversion
	dangerzone/isolation_provider/qubes.py:15: in <module>
	    from ..conversion.pixels_to_pdf import PixelsToPDF
	dangerzone/conversion/pixels_to_pdf.py:16: in <module>
	    import fitz
	E   ModuleNotFoundError: No module named 'fitz'

For context see discussion in [1].

[1]: #622 (comment)
  • Loading branch information
deeplow committed Dec 19, 2023
1 parent 917348f commit 75d4098
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions dangerzone/gui/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@

from .. import args, errors
from ..document import Document
from ..isolation_provider.container import Container
from ..isolation_provider.dummy import Dummy
from ..isolation_provider.qubes import Qubes, is_qubes_native_conversion
from ..isolation_provider.qubes import is_qubes_native_conversion
from ..util import get_resource_path, get_version
from .logic import DangerzoneGui
from .main_window import MainWindow
Expand Down Expand Up @@ -135,9 +134,13 @@ def gui_main(
dummy = Dummy()
dangerzone = DangerzoneGui(app, isolation_provider=dummy)
elif is_qubes_native_conversion():
from ..isolation_provider.qubes import Qubes

qubes = Qubes()
dangerzone = DangerzoneGui(app, isolation_provider=qubes)
else:
from ..isolation_provider.container import Container

container = Container(enable_timeouts=enable_timeouts)
dangerzone = DangerzoneGui(app, isolation_provider=container)

Expand Down

0 comments on commit 75d4098

Please sign in to comment.