jshiffer/slixmpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved parsing logic into TimeElement to aid reuse

Browse Source
This commit is contained in:
Thom Nichols 2010-07-14 11:05:29 -04:00
parent ad7c1b06f4
commit be5688007b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sleekxmpp/plugins/xep_0202.py
View File

@ -46,11 +46,9 @@ class xep_0202(base.base_plugin):
iq = self.xmpp.Iq( stream=self.xmpp, sto=to, stype='get', iq = self.xmpp.Iq( stream=self.xmpp, sto=to, stype='get',
xml = ET.Element(_XMLNS + 'time') ) xml = ET.Element(_XMLNS + 'time') )
resp = iq.send(iq) # wait for response resp = iq.send(iq) # wait for response
time_str = resp.find(_XMLNS + 'time/utc').text
dt_format = '%Y-%m-%dT%H:%M:%S'
if time_str.find('.') > -1: dt_format += '.%f' # milliseconds in format
return TimeElement( return TimeElement(
datetime.strptime( time_str, dt_format + 'Z' ), resp.find(_XMLNS + 'time/utc').text,
xml.find(_XMLNS + 'time/tzo').text ) xml.find(_XMLNS + 'time/tzo').text )
def _handle_get(self,xml): def _handle_get(self,xml):
@ -66,7 +64,15 @@ class TimeElement:
""" """
def __init__(self, utc=None, tzo="Z"): def __init__(self, utc=None, tzo="Z"):
self.utc = datetime.utcnow() if utc is None else utc if utc is None:
self.utc = datetime.utcnow()
elif type(utc) is str: # parse ISO string
dt_format = '%Y-%m-%dT%H:%M:%S'
if utc.find('.') > -1: dt_format += '.%f' # milliseconds in format
self.utc = datetime.strptime( time_str, dt_format + 'Z' )
elif type(utc) is float: # parse posix timestamp
self.utc = datetime.utcfromtimestamp()
else: self.utc = utc
self.tzo = tzo self.tzo = tzo
def to_xml(self): def to_xml(self):
@ -78,3 +84,6 @@ class TimeElement:
child.text = datetime.isoformat(self.utc) + "Z" child.text = datetime.isoformat(self.utc) + "Z"
time.append( child ) time.append( child )
return time return time
def __str__(self):
return ET.tostring( self.to_xml() )