diff options
author | Lance Stout <lancestout@gmail.com> | 2012-03-19 14:24:45 -0700 |
---|---|---|
committer | Lance Stout <lancestout@gmail.com> | 2012-03-19 14:24:45 -0700 |
commit | 859822ff05c0c19cc16965918ef1d76eb8e531cb (patch) | |
tree | 0daa391638fbb2ddaf2d0ea439fa3c44f3172b66 /sleekxmpp | |
parent | 3acc7d0914eb1ad883caf6a39685a807a17ba75c (diff) | |
download | slixmpp-859822ff05c0c19cc16965918ef1d76eb8e531cb.tar.gz slixmpp-859822ff05c0c19cc16965918ef1d76eb8e531cb.tar.bz2 slixmpp-859822ff05c0c19cc16965918ef1d76eb8e531cb.tar.xz slixmpp-859822ff05c0c19cc16965918ef1d76eb8e531cb.zip |
Fix unicode issues in test cases for Py3+ introduced by issue #150.
Diffstat (limited to 'sleekxmpp')
-rw-r--r-- | sleekxmpp/plugins/xep_0009/binding.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sleekxmpp/plugins/xep_0009/binding.py b/sleekxmpp/plugins/xep_0009/binding.py index 5418626b..a55993ad 100644 --- a/sleekxmpp/plugins/xep_0009/binding.py +++ b/sleekxmpp/plugins/xep_0009/binding.py @@ -10,6 +10,10 @@ from sleekxmpp.xmlstream import ET import base64 import logging import time +import sys + +if sys.version_info > (3, 0): + unicode = str log = logging.getLogger(__name__) @@ -152,7 +156,7 @@ class rpctime(object): def __init__(self,data=None): #assume string data is in iso format YYYYMMDDTHH:MM:SS - if type(data) is str: + if type(data) in (str, unicode): self.timestamp = time.strptime(data,"%Y%m%dT%H:%M:%S") elif type(data) is time.struct_time: self.timestamp = data |