Daniel Brötzmann pushed to branch omemo_integration at gajim / gajim
Commits:
77920710 by wurstsalat at 2022-10-19T23:07:29+02:00
chore: OMEMO: Remove obsolete qrcode version check
- - - - -
1 changed file:
- gajim/gtk/omemo_trust_manager.py
Changes:
=====================================
gajim/gtk/omemo_trust_manager.py
=====================================
@@ -26,9 +26,6 @@
import locale
import logging
import tempfile
-from packaging.version import Version as V
-
-from pkg_resources import get_distribution
from axolotl.identitykeypair import IdentityKeyPair # pyright: ignore
@@ -249,16 +246,7 @@ def _get_qrcode(jid: str, sid: int, identity_key:
IdentityKeyPair) -> str:
qr.add_data(ver_string)
qr.make(fit=True)
- fill_color = 'black'
- back_color = 'white'
- if V(get_distribution('qrcode').version) < V('6.0'):
- # meaning of fill_color and back_color were switched
- # before this commit in qrcode between versions 5.3
- # and 6.0: https://github.com/lincolnloop/python-qrcode/
- # commit/01f440d64b7d1f61bb75161ce118b86eca85b15c
- back_color, fill_color = fill_color, back_color
-
- img = qr.make_image(fill_color=fill_color, back_color=back_color)
+ img = qr.make_image(fill_color='black', back_color='white')
img.save(path)
return path
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/7792071012da603adb40f3a04c7ed115d5d01784
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/7792071012da603adb40f3a04c7ed115d5d01784
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
