# HG changeset patch # User souliane # Date 1423316843 -3600 # Node ID 4895e1e092fbf01073cf14e4ac2f55a1972d5d47 # Parent 9ca93ecdeea53eebc3d96911644711e16a41fdc9 frontends (tools): Pyjamas's JID implementation can be compared to an object of a different type: - always return False if the other object is not a JID - to not fake list membership's test, hash(jid) now differs from hash(unicode(jid)) diff -r 9ca93ecdeea5 -r 4895e1e092fb frontends/src/tools/jid.py --- a/frontends/src/tools/jid.py Fri Feb 06 22:28:00 2015 +0100 +++ b/frontends/src/tools/jid.py Sat Feb 07 14:47:23 2015 +0100 @@ -58,12 +58,14 @@ return getattr(self.__internal_str, name) def __eq__(self, other): + if not isinstance(other, JID): + return False return (self.node == other.node and self.domain == other.domain and self.resource == other.resource) def __hash__(self): - return hash(self.__internal_str) + return hash('JID<{}>'.format(self.__internal_str)) def find(self, *args): return self.__internal_str.find(*args) @@ -75,7 +77,7 @@ node_end = 0 domain_end = self.__internal_str.find('/') if domain_end == 0: - raise ValueError("a jid can't start with '/'") + raise ValueError("a jid can't start with '/'") if domain_end == -1: domain_end = len(self.__internal_str) self.node = self.__internal_str[:node_end] or None