almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

FIXUP: Moar CI fixes

Browse source
This commit is contained in:
Alex Pyrgiotis 2024-09-19 14:29:51 +03:00
parent 66af7bce59
commit 17bed1a724
No known key found for this signature in database
GPG key ID: B6C15EBA0357C9AA
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dangerzone/document.py
View file

@ -123,6 +123,10 @@ class Document:
self.validate_output_filename(filename) self.validate_output_filename(filename)
self._output_filename = filename self._output_filename = filename
@property
def sanitized_output_filename(self) -> None:
return util.replace_control_chars(self.output_filename)
@property @property
def suffix(self) -> str: def suffix(self) -> str:
return self._suffix return self._suffix

5
dangerzone/isolation_provider/base.py
View file

@ -216,7 +216,10 @@ class IsolationProvider(ABC):
# Ensure nothing else is read after all bitmaps are obtained # Ensure nothing else is read after all bitmaps are obtained
p.stdout.close() p.stdout.close()
safe_doc.save(document.output_filename) # Saving it with a different name first, because PyMuPDF cannot handle
# non-Unicode chars.
safe_doc.save(document.sanitized_output_filename)
os.replace(document.sanitized_output_filename, document.output_filename)
# TODO handle leftover code input # TODO handle leftover code input
text = "Converted document" text = "Converted document"

2
poetry.lock generated
View file

@ -1046,4 +1046,4 @@ type = ["pytest-mypy"]
[metadata] [metadata]
lock-version = "2.0" lock-version = "2.0"
python-versions = ">=3.9,<3.13" python-versions = ">=3.9,<3.13"
content-hash = "93097a7d09c23ca12dbedd440965381fdd12dca2a8b1a0defe0f75b0e4e2092a" content-hash = "9b4083a41b94d03d7688fb6fcc82a0af9839f4dfc769204548c44bf35bcda60b"

2
pyproject.toml
View file

@ -17,7 +17,7 @@ python = ">=3.9,<3.13"
click = "*" click = "*"
appdirs = "*" appdirs = "*"
PySide6 = "^6.7.1" PySide6 = "^6.7.1"
PyMuPDF = "^1.23.8" PyMuPDF = "^1.23.3" # The version in Fedora 39
colorama = "*" colorama = "*"
pyxdg = {version = "*", platform = "linux"} pyxdg = {version = "*", platform = "linux"}
requests = "*" requests = "*"

2
tests/isolation_provider/test_qubes.py
View file

@ -79,7 +79,7 @@ class TestQubes(IsolationProviderTest):
) )
with pytest.raises(errors.ConverterProcException): with pytest.raises(errors.ConverterProcException):
doc = Document(sample_doc) doc = Document(sample_doc)
provider.doc_to_pixels(doc, tmpdir, proc) provider._convert(doc, tmpdir, None, proc)
assert provider.get_proc_exception(proc) == errors.QubesQrexecFailed assert provider.get_proc_exception(proc) == errors.QubesQrexecFailed