mirror of
https://github.com/correl/SleekXMPP.git
synced 2024-11-23 19:19:53 +00:00
Allow XEP-0082 to return datetime objects without having to format and reparse.
This commit is contained in:
parent
116bb6e1b9
commit
d496417deb
1 changed files with 21 additions and 8 deletions
|
@ -76,7 +76,7 @@ def format_datetime(time_obj):
|
||||||
return '%sZ' % timestamp
|
return '%sZ' % timestamp
|
||||||
return timestamp
|
return timestamp
|
||||||
|
|
||||||
def date(year=None, month=None, day=None):
|
def date(year=None, month=None, day=None, obj=False):
|
||||||
"""
|
"""
|
||||||
Create a date only timestamp for the given instant.
|
Create a date only timestamp for the given instant.
|
||||||
|
|
||||||
|
@ -86,6 +86,8 @@ def date(year=None, month=None, day=None):
|
||||||
year -- Integer value of the year (4 digits)
|
year -- Integer value of the year (4 digits)
|
||||||
month -- Integer value of the month
|
month -- Integer value of the month
|
||||||
day -- Integer value of the day of the month.
|
day -- Integer value of the day of the month.
|
||||||
|
obj -- If True, return the date object instead
|
||||||
|
of a formatted string. Defaults to False.
|
||||||
"""
|
"""
|
||||||
today = dt.datetime.utcnow()
|
today = dt.datetime.utcnow()
|
||||||
if year is None:
|
if year is None:
|
||||||
|
@ -94,9 +96,12 @@ def date(year=None, month=None, day=None):
|
||||||
month = today.month
|
month = today.month
|
||||||
if day is None:
|
if day is None:
|
||||||
day = today.day
|
day = today.day
|
||||||
return format_date(dt.date(year, month, day))
|
value = dt.date(year, month, day)
|
||||||
|
if obj:
|
||||||
|
return value
|
||||||
|
return format_date(value)
|
||||||
|
|
||||||
def time(hour=None, min=None, sec=None, micro=None, offset=None):
|
def time(hour=None, min=None, sec=None, micro=None, offset=None, obj=False):
|
||||||
"""
|
"""
|
||||||
Create a time only timestamp for the given instant.
|
Create a time only timestamp for the given instant.
|
||||||
|
|
||||||
|
@ -110,6 +115,8 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
|
||||||
offset -- Either a positive or negative number of seconds
|
offset -- Either a positive or negative number of seconds
|
||||||
to offset from UTC to match a desired timezone,
|
to offset from UTC to match a desired timezone,
|
||||||
or a tzinfo object.
|
or a tzinfo object.
|
||||||
|
obj -- If True, return the time object instead
|
||||||
|
of a formatted string. Defaults to False.
|
||||||
"""
|
"""
|
||||||
now = dt.datetime.utcnow()
|
now = dt.datetime.utcnow()
|
||||||
if hour is None:
|
if hour is None:
|
||||||
|
@ -124,12 +131,14 @@ def time(hour=None, min=None, sec=None, micro=None, offset=None):
|
||||||
offset = tzutc()
|
offset = tzutc()
|
||||||
elif not isinstance(offset, dt.tzinfo):
|
elif not isinstance(offset, dt.tzinfo):
|
||||||
offset = tzoffset(None, offset)
|
offset = tzoffset(None, offset)
|
||||||
time = dt.time(hour, min, sec, micro, offset)
|
value = dt.time(hour, min, sec, micro, offset)
|
||||||
return format_time(time)
|
if obj:
|
||||||
|
return value
|
||||||
|
return format_time(value)
|
||||||
|
|
||||||
def datetime(year=None, month=None, day=None, hour=None,
|
def datetime(year=None, month=None, day=None, hour=None,
|
||||||
min=None, sec=None, micro=None, offset=None,
|
min=None, sec=None, micro=None, offset=None,
|
||||||
separators=True):
|
separators=True, obj=False):
|
||||||
"""
|
"""
|
||||||
Create a datetime timestamp for the given instant.
|
Create a datetime timestamp for the given instant.
|
||||||
|
|
||||||
|
@ -146,6 +155,8 @@ def datetime(year=None, month=None, day=None, hour=None,
|
||||||
offset -- Either a positive or negative number of seconds
|
offset -- Either a positive or negative number of seconds
|
||||||
to offset from UTC to match a desired timezone,
|
to offset from UTC to match a desired timezone,
|
||||||
or a tzinfo object.
|
or a tzinfo object.
|
||||||
|
obj -- If True, return the datetime object instead
|
||||||
|
of a formatted string. Defaults to False.
|
||||||
"""
|
"""
|
||||||
now = dt.datetime.utcnow()
|
now = dt.datetime.utcnow()
|
||||||
if year is None:
|
if year is None:
|
||||||
|
@ -167,9 +178,11 @@ def datetime(year=None, month=None, day=None, hour=None,
|
||||||
elif not isinstance(offset, dt.tzinfo):
|
elif not isinstance(offset, dt.tzinfo):
|
||||||
offset = tzoffset(None, offset)
|
offset = tzoffset(None, offset)
|
||||||
|
|
||||||
date = dt.datetime(year, month, day, hour,
|
value = dt.datetime(year, month, day, hour,
|
||||||
min, sec, micro, offset)
|
min, sec, micro, offset)
|
||||||
return format_datetime(date)
|
if obj:
|
||||||
|
return value
|
||||||
|
return format_datetime(value)
|
||||||
|
|
||||||
class xep_0082(base_plugin):
|
class xep_0082(base_plugin):
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue