From fa8950b4a4d5f66a4b0eb9a1d8c2ff590d1e1ee1 Mon Sep 17 00:00:00 2001 From: Valentin Lorentz Date: Sat, 4 Aug 2012 14:52:17 +0200 Subject: [PATCH] Make type checks in ircutils.safeArgument compatible with Python 3. --- src/ircutils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/ircutils.py b/src/ircutils.py index 56aebbc0e..5d074c268 100644 --- a/src/ircutils.py +++ b/src/ircutils.py @@ -38,6 +38,7 @@ work in an IRC-case-insensitive fashion), and numerous other things. from __future__ import division import re +import sys import time import random import string @@ -460,9 +461,10 @@ def isValidArgument(s): def safeArgument(s): """If s is unsafe for IRC, returns a safe version.""" - if isinstance(s, unicode): + if sys.version_info[0] < 3 and isinstance(s, unicode): s = s.encode('utf-8') - elif not isinstance(s, basestring): + elif (sys.version_info[0] < 3 and not isinstance(s, basestring)) or \ + (sys.version_info[0] >= 3 and not isinstance(s, str)): debug('Got a non-string in safeArgument: %r', s) s = str(s) if isValidArgument(s):