From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 5 Jan 2023 13:41:21 +0000 (+0000)
Subject: libstdc++: Fix <chrono> printers for Python 2 [PR108212]
X-Git-Tag: basepoints/gcc-14~2173
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80ff207da6d8784e227eb93f75c4ac5a300c8420;p=thirdparty%2Fgcc.git

libstdc++: Fix <chrono> printers for Python 2 [PR108212]

The datetime.timezone.utc singleton doesn't exist in Python 2, but we
can create it ourselves by deriving from datetime.tzinfo.

libstdc++-v3/ChangeLog:

	PR libstdc++/108212
	* python/libstdcxx/v6/printers.py (_utc_timezone): New global
	variable.
	(StdChronoTimePointPrinter::to_string): Use it.
---

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 7e694f48f28d..8cfb4f26b0e0 100644
--- a/libstdc++-v3/python/libstdcxx/v6/printers.py
+++ b/libstdc++-v3/python/libstdcxx/v6/printers.py
@@ -19,7 +19,7 @@ import gdb
 import itertools
 import re
 import sys, os, errno
-from datetime import datetime, timezone
+import datetime
 
 ### Python 2 + Python 3 compatibility code
 
@@ -45,6 +45,7 @@ if sys.version_info[0] > 2:
     izip = zip
     # Also, int subsumes long
     long = int
+    _utc_timezone = datetime.timezone.utc
 else:
     ### Python 2 stuff
     class Iterator:
@@ -64,6 +65,20 @@ else:
     # In Python 2, we still need these from itertools
     from itertools import imap, izip
 
+    # Python 2 does not provide the datetime.UTC singleton.
+    class UTC(datetime.tzinfo):
+        """Concrete tzinfo class representing the UTC time zone"""
+
+        def utcoffset(self, dt):
+            return datetime.timedelta(0)
+
+        def tzname(self, dt):
+            return "UTC"
+
+        def dst(self, dt):
+            return datetime.timedelta(0)
+    _utc_timezone = UTC()
+
 # Try to use the new-style pretty-printing if available.
 _use_gdb_pp = True
 try:
@@ -1955,7 +1970,7 @@ class StdChronoTimePointPrinter:
             num, den = printer._ratio()
             secs = (r * num / den) + offset
             try:
-                dt = datetime.fromtimestamp(secs, timezone.utc)
+                dt = datetime.fromtimestamp(secs, _utc_timezone)
                 time = ' [{:%Y-%m-%d %H:%M:%S}]'.format(dt)
             except:
                 pass