diff options
| author | Emmanuel Gil Peyrot <linkmauve@linkmauve.fr> | 2014-08-16 22:37:25 +0200 |
|---|---|---|
| committer | Florent Le Coz <louiz@louiz.org> | 2014-09-01 02:42:45 +0200 |
| commit | 0e950154103ba9385b13f76548befa87509995f3 (patch) | |
| tree | 14f38018f0ca25deed5729c7f4c9fd84779e5655 /slixmpp/plugins/xep_0009 | |
| parent | b92dac72f3bb601837dde507597d47715c5ad1aa (diff) | |
| download | slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.gz slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.bz2 slixmpp-0e950154103ba9385b13f76548befa87509995f3.tar.xz slixmpp-0e950154103ba9385b13f76548befa87509995f3.zip | |
Remove sys.version_info checks for python2 and clean some imports.
Diffstat (limited to 'slixmpp/plugins/xep_0009')
| -rw-r--r-- | slixmpp/plugins/xep_0009/binding.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/slixmpp/plugins/xep_0009/binding.py b/slixmpp/plugins/xep_0009/binding.py index 5416fc41..d922dfc7 100644 --- a/slixmpp/plugins/xep_0009/binding.py +++ b/slixmpp/plugins/xep_0009/binding.py @@ -10,10 +10,6 @@ from slixmpp.xmlstream import ET import base64 import logging import time -import sys - -if sys.version_info > (3, 0): - unicode = str log = logging.getLogger(__name__) @@ -58,7 +54,7 @@ def _py2xml(*args): boolean = ET.Element("{%s}boolean" % _namespace) boolean.text = str(int(x)) val.append(boolean) - elif type(x) in (str, unicode): + elif type(x) is str: string = ET.Element("{%s}string" % _namespace) string.text = x val.append(string) @@ -156,7 +152,7 @@ class rpctime(object): def __init__(self,data=None): #assume string data is in iso format YYYYMMDDTHH:MM:SS - if type(data) in (str, unicode): + if type(data) is str: self.timestamp = time.strptime(data,"%Y%m%dT%H:%M:%S") elif type(data) is time.struct_time: self.timestamp = data |