[Pkg-privacy-commits] [torbrowser-launcher] 21/48: Add import exception handling for gpg module

[Roger Shimizu]

This is an automated email from the git hooks/post-receive script.

rosh pushed a commit to branch debian/sid
in repository torbrowser-launcher.

commit d9d4f75a7068c87b383d420890b9559c06ff33cf
Author: Dan Snider <dan at dephekt.net>
Date:   Wed Mar 22 07:52:45 2017 -0500

    Add import exception handling for gpg module
---
 BUILD.md                        |  3 +--
 stdeb.cfg                       |  2 +-
 torbrowser_launcher/common.py   | 20 ++++++++++++++++++--
 torbrowser_launcher/launcher.py | 21 ++++++++++++++++++++-
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/BUILD.md b/BUILD.md
index e001339..a098e5b 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -12,7 +12,7 @@ Then install dependencies, build a package, and install:
 ### Debian, Ubuntu, Linux Mint, etc.
 
 ```sh
-sudo apt-get install build-essential dh-python python-all python-stdeb python-gtk2 python-twisted python-lzma python-txsocksx gnupg fakeroot xz-utils tor gpg
+sudo apt-get install build-essential dh-python python-all python-stdeb python-gtk2 python-twisted python-lzma python-txsocksx gnupg fakeroot xz-utils tor python-gpgme
 ./build_deb.sh
 sudo dpkg -i deb_dist/torbrowser-launcher_*.deb
 ```
@@ -33,4 +33,3 @@ Optionally you can install `pygame` if you want to play a modem sound while Tor
 
 Install the dependencies: sadly, not all of them are available in virtualenv, so you will need to install (some of) them system-wide.
 Then, you can run: `TBL_SHARE=share ./torbrowser-launcher`
-
diff --git a/stdeb.cfg b/stdeb.cfg
index 2742a32..ef66458 100644
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -1,6 +1,6 @@
 [DEFAULT]
 Package: torbrowser-launcher
-Depends: python-gtk2, python-twisted, python-lzma, python-gpg, gnupg, xz-utils
+Depends: python-gtk2, python-twisted, python-lzma, python-gpgme, gnupg, xz-utils
 Build-Depends: dh-python
 Recommends: python-pygame, python-txsocksx, tor
 Suite: trusty
diff --git a/torbrowser_launcher/common.py b/torbrowser_launcher/common.py
index b4410d4..62d9e48 100644
--- a/torbrowser_launcher/common.py
+++ b/torbrowser_launcher/common.py
@@ -26,7 +26,23 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-import os, sys, platform, subprocess, locale, pickle, json, re, gpg
+import os
+import sys
+import platform
+import subprocess
+import locale
+import pickle
+import json
+import re
+
+try:
+    import gpg
+except ImportError:
+    try:
+        import gpgme as gpg
+    except ImportError:
+        gpg_support = False
+        print('You need the gpgme Python bindings installed to verify integrity of downloaded archives.')
 
 import pygtk
 pygtk.require('2.0')
@@ -202,7 +218,7 @@ class Common:
                 return False
             else:
                 result = c.op_import_result()
-                if (result and self.fingerprints[key] in result.imports[0].fpr):
+                if result and self.fingerprints[key] in result.imports[0].fpr:
                     return True
                 else:
                     return False
diff --git a/torbrowser_launcher/launcher.py b/torbrowser_launcher/launcher.py
index b019485..cb2e2b1 100644
--- a/torbrowser_launcher/launcher.py
+++ b/torbrowser_launcher/launcher.py
@@ -26,13 +26,32 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-import os, subprocess, time, json, tarfile, hashlib, lzma, threading, re, unicodedata, gpg
+import os
+import subprocess
+import time
+import json
+import tarfile
+import hashlib
+import lzma
+import threading
+import re
+import unicodedata
+
 from twisted.internet import reactor
 from twisted.web.client import Agent, RedirectAgent, ResponseDone, ResponseFailed
 from twisted.web.http_headers import Headers
 from twisted.internet.protocol import Protocol
 from twisted.internet.error import DNSLookupError, ConnectionRefusedError
 
+try:
+    import gpg
+except ImportError:
+    try:
+        import gpgme as gpg
+    except ImportError:
+        gpg_support = False
+        print('You need the gpgme Python bindings installed to verify integrity of downloaded archives.')
+
 import xml.etree.ElementTree as ET
 
 import OpenSSL

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/torbrowser-launcher.git