Issue #25827: Merge with 3.5

1 files changed, 3 insertions, 0 deletions

diff --git a/Lib/datetime.py b/Lib/datetime.py
index b9719cbb48..b734a743d0 100644
--- a/Lib/datetime.py
+++ b/Lib/datetime.py
@@ -316,6 +316,7 @@ def _divide_and_round(a, b):
 
     return q
 
+
 class timedelta:
     """Represent the difference between two datetime objects.
 
@@ -1912,6 +1913,8 @@ class timezone(tzinfo):
 
     @staticmethod
     def _name_from_offset(delta):
+        if not delta:
+            return 'UTC'
         if delta < timedelta(0):
             sign = '-'
             delta = -delta