[tor-commits] [pytorctl/master] Remove python 2.5ism

[mikeperry@xxxxxxxxxxxxxx]

commit 7cd3224c4615c8b2e3f465ed2d1b22d2f9dbf89f
Author: Mike Perry <mikeperry-git@xxxxxxxxxx>
Date:   Mon Jun 20 10:03:30 2011 -0700

    Remove python 2.5ism
---
 TorCtl.py |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/TorCtl.py b/TorCtl.py
index c515c97..edf9408 100755
--- a/TorCtl.py
+++ b/TorCtl.py
@@ -617,7 +617,8 @@ class Connection:
       try:
         authInfo = self.sendAndRecv("PROTOCOLINFO\r\n")[1][1]
       except Exception, exc:
-        excMsg = ": %s" % exc if exc.message else ""
+        if exc.message: excMsg = ": %s" % exc
+        else: excMsg = ""
         raise IOError("Unable to query PROTOCOLINFO for the authentication type%s" % excMsg)
       
       authType, cookiePath = None, None

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits