From: Adam <redacted>
Date: Wed, 17 Sep 2014 05:09:59 +0000 (-0400)
Subject: try/except unicode decode errors because python
X-Git-Url: https://jfr.im/git/irc/rizon/acid.git/commitdiff_plain/4f1ef484e982d29eb7e2967f6ab112b61b0556f0

try/except unicode decode errors because python
---

diff --git a/pyva/pyva/src/main/python/ctcp/ctcp.py b/pyva/pyva/src/main/python/ctcp/ctcp.py
index 63fbd29..98e5a2b 100644
--- a/pyva/pyva/src/main/python/ctcp/ctcp.py
+++ b/pyva/pyva/src/main/python/ctcp/ctcp.py
@@ -110,14 +110,17 @@ class ctcp(AcidPlugin):
 			return # Can this throw?
 
 		#ctcp website reply
-		if reply.lower().startswith(u"website"):
-			reply = reply[8:]
-			try:
-				self.dbp.execute(u"INSERT INTO ctcp_website (reply, found) VALUES(%s, 1) ON DUPLICATE KEY UPDATE found=found+1;", (reply,))
-			except Exception, err:
-				self.log.exception(u"Error updating ctcp_website: %s (%s)" % (reply, err))
-			user['website'] = reply
-			return
+		try:
+			if reply.lower().startswith(u"website"):
+				reply = reply[8:]
+				try:
+					self.dbp.execute(u"INSERT INTO ctcp_website (reply, found) VALUES(%s, 1) ON DUPLICATE KEY UPDATE found=found+1;", (reply,))
+				except Exception, err:
+					self.log.exception(u"Error updating ctcp_website: %s (%s)" % (reply, err))
+				user['website'] = reply
+				return
+		except:
+			return # XXX
 
 		#ctcp version reply
 		if not reply.lower().startswith(u"version"): return
diff --git a/pyva/pyva/src/main/python/trivia/trivia_engine.py b/pyva/pyva/src/main/python/trivia/trivia_engine.py
index 901ddba..47e2c23 100644
--- a/pyva/pyva/src/main/python/trivia/trivia_engine.py
+++ b/pyva/pyva/src/main/python/trivia/trivia_engine.py
@@ -161,9 +161,12 @@ class Trivia(object):
 
 		found = False
 		for a in self.answer:
-			if a.lower() in answer.lower():
-				found = True
-				break
+			try:
+				if a.lower() in answer.lower():
+					found = True
+					break
+			except:
+				pass # XXX unicode
 
 		if not found:
 			return