[Python-checkins] xmlrpc.client uses datetime.datetime.isoformat() (#105741)
vstinner
webhook-mailer at python.org
Wed Jun 14 11:00:47 EDT 2023
https://github.com/python/cpython/commit/307bceaa65c4f1a8e110cd7a9cce6e93a1b021ba
commit: 307bceaa65c4f1a8e110cd7a9cce6e93a1b021ba
branch: main
author: Victor Stinner <vstinner at python.org>
committer: vstinner <vstinner at python.org>
date: 2023-06-14T17:00:40+02:00
summary:
xmlrpc.client uses datetime.datetime.isoformat() (#105741)
Reimplement _iso8601_format() using the datetime isoformat() method.
Ignore the timezone.
Co-Authored-by: Paul Ganssle <1377457+pganssle at users.noreply.github.com>
files:
M Lib/test/test_xmlrpc.py
M Lib/xmlrpc/client.py
diff --git a/Lib/test/test_xmlrpc.py b/Lib/test/test_xmlrpc.py
index 9ff5545f786a3..edc741dbc6008 100644
--- a/Lib/test/test_xmlrpc.py
+++ b/Lib/test/test_xmlrpc.py
@@ -504,10 +504,16 @@ def test_time_struct(self):
self.assertEqual(str(t), time.strftime("%Y%m%dT%H:%M:%S", d))
def test_datetime_datetime(self):
+ # naive (no tzinfo)
d = datetime.datetime(2007,1,2,3,4,5)
t = xmlrpclib.DateTime(d)
self.assertEqual(str(t), '20070102T03:04:05')
+ # aware (with tzinfo): the timezone is ignored
+ d = datetime.datetime(2023, 6, 12, 13, 30, tzinfo=datetime.UTC)
+ t = xmlrpclib.DateTime(d)
+ self.assertEqual(str(t), '20230612T13:30:00')
+
def test_repr(self):
d = datetime.datetime(2007,1,2,3,4,5)
t = xmlrpclib.DateTime(d)
diff --git a/Lib/xmlrpc/client.py b/Lib/xmlrpc/client.py
index ea8da766cb5a7..f441376d09c4a 100644
--- a/Lib/xmlrpc/client.py
+++ b/Lib/xmlrpc/client.py
@@ -245,41 +245,15 @@ def __repr__(self):
##
# Backwards compatibility
-
boolean = Boolean = bool
-##
-# Wrapper for XML-RPC DateTime values. This converts a time value to
-# the format used by XML-RPC.
-# <p>
-# The value can be given as a datetime object, as a string in the
-# format "yyyymmddThh:mm:ss", as a 9-item time tuple (as returned by
-# time.localtime()), or an integer value (as returned by time.time()).
-# The wrapper uses time.localtime() to convert an integer to a time
-# tuple.
-#
-# @param value The time, given as a datetime object, an ISO 8601 string,
-# a time tuple, or an integer time value.
-
-# Issue #13305: different format codes across platforms
-_day0 = datetime(1, 1, 1)
-def _try(fmt):
- try:
- return _day0.strftime(fmt) == '0001'
- except ValueError:
- return False
-if _try('%Y'): # Mac OS X
- def _iso8601_format(value):
- return value.strftime("%Y%m%dT%H:%M:%S")
-elif _try('%4Y'): # 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
-del _try
+def _iso8601_format(value):
+ if value.tzinfo is not None:
+ # XML-RPC only uses the naive portion of the datetime
+ value = value.replace(tzinfo=None)
+ # XML-RPC doesn't use '-' separator in the date part
+ return value.isoformat(timespec='seconds').replace('-', '')
def _strftime(value):
More information about the Python-checkins
mailing list