[Pkg-privacy-commits] [onioncircuits] 18/62: Adds compatibility with python3

[Intrigeri]

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

intrigeri pushed a commit to branch master
in repository onioncircuits.

commit cc84c3bc46addd5a4f71629881d0070d8fe5e81e
Author: Tails developers <tails at boum.org>
Date:   Sun Feb 22 02:30:16 2015 +0100

    Adds compatibility with python3
---
 tormonitor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tormonitor b/tormonitor
index eb2c07e..b13cd2a 100755
--- a/tormonitor
+++ b/tormonitor
@@ -38,7 +38,7 @@ from gi.repository import (GLib,
 
 gettext.install('tormonitor')
 
-if os.environ.has_key('DEBUG') and os.environ['DEBUG']:
+if 'DEBUG' in os.environ and os.environ['DEBUG']:
     logging.basicConfig(level=logging.DEBUG)
 else:
     logging.getLogger('stem').setLevel(logging.WARNING)
@@ -492,7 +492,7 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
         circ_id = model.get_value(circuit_iter, 1)
         try:
             circuit = self.controller.get_circuit(circ_id)
-        except ValueError, e: # The circuit doesn't exist anymore
+        except ValueError as e: # The circuit doesn't exist anymore
             logging.debug("circuit %s not known by Tor: %s" % (circ_id, e))
             return False
         self.show_circuit_details(circuit)

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