bpo-33810 Remove unused code from datetime.py. (GH-7549)
authorAlexander Belopolsky <abalkin@users.noreply.github.com>
Fri, 8 Jun 2018 23:22:33 +0000 (19:22 -0400)
committerGitHub <noreply@github.com>
Fri, 8 Jun 2018 23:22:33 +0000 (19:22 -0400)
Since implementation of bpo-25283, the objects returned by time.localtime
always have tm_zone and tm_gmtoff attributes.  Remove code that
anticipates their absence.

Lib/datetime.py

index 8fa18a78932c0481f4890d2fe53ca9a19fccafe2..5e9aab97002a753788fc25ee2d6fee3d6cfa9dcf 100644 (file)
@@ -1759,17 +1759,10 @@ class datetime(date):
             ts = (self - _EPOCH) // timedelta(seconds=1)
         localtm = _time.localtime(ts)
         local = datetime(*localtm[:6])
-        try:
-            # Extract TZ data if available
-            gmtoff = localtm.tm_gmtoff
-            zone = localtm.tm_zone
-        except AttributeError:
-            delta = local - datetime(*_time.gmtime(ts)[:6])
-            zone = _time.strftime('%Z', localtm)
-            tz = timezone(delta, zone)
-        else:
-            tz = timezone(timedelta(seconds=gmtoff), zone)
-        return tz
+        # Extract TZ data
+        gmtoff = localtm.tm_gmtoff
+        zone = localtm.tm_zone
+        return timezone(timedelta(seconds=gmtoff), zone)
 
     def astimezone(self, tz=None):
         if tz is None: