public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
From: Jonathan Wakely <redi@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r13-5034] libstdc++: Fix <chrono> printers for Python 2 [PR108212]
Date: Thu,  5 Jan 2023 16:28:54 +0000 (GMT)	[thread overview]
Message-ID: <20230105162854.D49413858C31@sourceware.org> (raw)

https://gcc.gnu.org/g:80ff207da6d8784e227eb93f75c4ac5a300c8420

commit r13-5034-g80ff207da6d8784e227eb93f75c4ac5a300c8420
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Thu Jan 5 13:41:21 2023 +0000

    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:
---
 libstdc++-v3/python/libstdcxx/v6/printers.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/libstdc++-v3/python/libstdcxx/v6/printers.py b/libstdc++-v3/python/libstdcxx/v6/printers.py
index 7e694f48f28..8cfb4f26b0e 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

                 reply	other threads:[~2023-01-05 16:28 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230105162854.D49413858C31@sourceware.org \
    --to=redi@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    --cc=libstdc++-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).