github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some bugs in time handling.

Browse source 
Namely, minutes and seconds were reversed.
This commit is contained in:
Lance Stout 2011-07-03 13:40:57 -07:00
parent 2e8e542bc9
commit c98f5d4450
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
sleekxmpp/plugins/xep_0082.py
View file

@ -105,8 +105,9 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
min -- Integer value of the number of minutes. min -- Integer value of the number of minutes.
sec -- Integer value of the number of seconds. sec -- Integer value of the number of seconds.
micro -- Integer value of the number of microseconds. micro -- Integer value of the number of microseconds.
offset -- A positive or negative number of seconds to offset -- Either a positive or negative number of seconds
offset from UTC to match a desired timezone. to offset from UTC to match a desired timezone,
or a tzinfo object.
""" """
now = dt.datetime.utcnow() now = dt.datetime.utcnow()
if hour is None: if hour is None:
@ -119,7 +120,7 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
micro = now.microsecond micro = now.microsecond
if offset is None: if offset is None:
offset = tzutc() offset = tzutc()
else: elif not isinstance(offset, dt.tzinfo):
offset = tzoffset(None, offset) offset = tzoffset(None, offset)
time = dt.time(hour, min, sec, micro, offset) time = dt.time(hour, min, sec, micro, offset)
return format_time(time) return format_time(time)
@ -140,8 +141,9 @@ def datetime(year=None, month=None, day=None, hour=None,
min -- Integer value of the number of minutes. min -- Integer value of the number of minutes.
sec -- Integer value of the number of seconds. sec -- Integer value of the number of seconds.
micro -- Integer value of the number of microseconds. micro -- Integer value of the number of microseconds.
offset -- A positive or negative number of seconds to offset -- Either a positive or negative number of seconds
offset from UTC to match a desired timezone. to offset from UTC to match a desired timezone,
or a tzinfo object.
""" """
now = dt.datetime.utcnow() now = dt.datetime.utcnow()
if year is None: if year is None:
@ -160,11 +162,11 @@ def datetime(year=None, month=None, day=None, hour=None,
micro = now.microsecond micro = now.microsecond
if offset is None: if offset is None:
offset = tzutc() offset = tzutc()
else: elif not isinstance(offset, dt.tzinfo):
offset = tzoffset(None, offset) offset = tzoffset(None, offset)
date = dt.datetime(year, month, day, hour, date = dt.datetime(year, month, day, hour,
sec, min, micro, offset) min, sec, micro, offset)
return format_datetime(date) return format_datetime(date)
class xep_0082(base_plugin): class xep_0082(base_plugin):