From e696a4587f982c0097199b69d5ccba76506c6a44 Mon Sep 17 00:00:00 2001 From: "Eric S. Raymond" Date: Thu, 4 Oct 2012 00:47:28 -0400 Subject: [PATCH] One of breitenfelds's isinstance() patches was wrong. --- irkerd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irkerd b/irkerd index 1e11343..2567ccd 100755 --- a/irkerd +++ b/irkerd @@ -391,14 +391,14 @@ class Irker: channels = request['to'] message = request['privmsg'] if not isinstance(channels, (list, unicode)) \ - or not isinstance(message, unicode): + and not isinstance(message, unicode): self.logerr("malformed request - unexpected types: %r" % request) else: if isinstance(channels, unicode): channels = [channels] for url in channels: - if not isinstance(url, unicode): - self.logerr("malformed request - unexpected type: %r" % request) + if not type(url) in (type(""), type(u"")): + self.logerr("malformed request - URL has unexpected type: %r" % url) else: target = Target(url) if not target.valid(): -- 2.26.2