mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 02:39:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Fix regression due to changeset 2096158376e5 (issue #13305).

Browse source
This commit is contained in:
Florent Xicluna 2011-11-01 00:06:58 +01:00
parent e695eec24a
commit 2738a64621
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
Lib/xmlrpc/client.py
View file

@ -250,18 +250,33 @@ boolean = Boolean = bool
# Wrapper for XML-RPC DateTime values. This converts a time value to # Wrapper for XML-RPC DateTime values. This converts a time value to
# the format used by XML-RPC. # the format used by XML-RPC.
# <p> # <p>
# The value can be given as a string in the format # The value can be given as a datetime object, as a string in the
# "yyyymmddThh:mm:ss", as a 9-item time tuple (as returned by # format "yyyymmddThh:mm:ss", as a 9-item time tuple (as returned by
# time.localtime()), or an integer value (as returned by time.time()). # time.localtime()), or an integer value (as returned by time.time()).
# The wrapper uses time.localtime() to convert an integer to a time # The wrapper uses time.localtime() to convert an integer to a time
# tuple. # tuple.
# #
# @param value The time, given as an ISO 8601 string, a time # @param value The time, given as a datetime object, an ISO 8601 string,
# tuple, or a integer time value. # a time tuple, or an integer time value.
# Issue #13305: different format codes across platforms
_day0 = datetime(1, 1, 1)
if _day0.strftime('%Y') == '0001': # Mac OS X
def _iso8601_format(value):
return value.strftime("%Y%m%dT%H:%M:%S")
elif _day0.strftime('%4Y') == '0001': # Linux
def _iso8601_format(value):
return value.strftime("%4Y%m%dT%H:%M:%S")
else:
def _iso8601_format(value):
return value.strftime("%Y%m%dT%H:%M:%S").zfill(17)
del _day0
def _strftime(value): def _strftime(value):
if isinstance(value, datetime): if isinstance(value, datetime):
return value.strftime("%Y%m%dT%H:%M:%S") return _iso8601_format(value)
if not isinstance(value, (tuple, time.struct_time)): if not isinstance(value, (tuple, time.struct_time)):
if value == 0: if value == 0:
@ -288,7 +303,7 @@ class DateTime:
o = other.value o = other.value
elif isinstance(other, datetime): elif isinstance(other, datetime):
s = self.value s = self.value
o = other.strftime("%Y%m%dT%H:%M:%S") o = _iso8601_format(other)
elif isinstance(other, str): elif isinstance(other, str):
s = self.value s = self.value
o = other o = other