[gnome-keysign: 53/75] Merge branch 'py3'
- From: Gitlab System User <gitlab src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keysign: 53/75] Merge branch 'py3'
- Date: Fri, 29 Sep 2017 11:26:47 +0000 (UTC)
commit 11b47ad45a5368d3b88047dc7560077387c3f64f
Merge: 3e4bf21 8593ae8
Author: Tobias Mueller <muelli cryptobitch de>
Date: Sat Aug 19 14:57:01 2017 +0200
Merge branch 'py3'
RELEASE_NOTES | 2 +-
babelglade/__init__.py | 2 +-
keysign/GtkKeyserver.py | 2 +-
keysign/KeyPresent.py | 2 +-
keysign/Keyserver.py | 6 +--
keysign/QRCode.py | 12 +++++-
keysign/avahioffer.py | 9 +++--
keysign/gpgkey.py | 88 +++++++++++++++++++++++++----------------
keysign/gpgmeh.py | 2 +-
keysign/gpgmks.py | 19 ++++++---
keysign/keyconfirm.py | 2 +-
keysign/keylistwidget.py | 12 ++++--
keysign/network/AvahiBrowser.py | 5 ++-
keysign/util.py | 6 +--
tests/test_gpgmeh.py | 25 +++++++++---
tests/test_gpgmks.py | 6 ++-
tests/test_latin1.py | 69 ++++++++++++++++++++++++++++++++
tests/test_uids.py | 43 ++++++++++++++++++++
18 files changed, 243 insertions(+), 69 deletions(-)
---
diff --cc keysign/GtkKeyserver.py
index c119f77,146b0d2..146b0d2
mode 100755,100644..100755
--- a/keysign/GtkKeyserver.py
+++ b/keysign/GtkKeyserver.py
diff --cc keysign/KeyPresent.py
index 58acea0,d5177d0..d5177d0
mode 100755,100644..100755
--- a/keysign/KeyPresent.py
+++ b/keysign/KeyPresent.py
diff --cc keysign/avahioffer.py
index a4e4d8a,710c98b..4b2f749
mode 100755,100644..100755
--- a/keysign/avahioffer.py
+++ b/keysign/avahioffer.py
diff --cc keysign/keyconfirm.py
index a3d08d5,b5c6d0e..b5c6d0e
mode 100755,100644..100755
--- a/keysign/keyconfirm.py
+++ b/keysign/keyconfirm.py
diff --cc keysign/keylistwidget.py
index 2532228,5ca7718..0047f3d
mode 100755,100644..100755
--- a/keysign/keylistwidget.py
+++ b/keysign/keylistwidget.py
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]