Add ZoneInfo support.

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Unreleased
+### Add
+* Add ZoneInfo support
+
 ## [3.6.4] - 2021-09-15
 ### Add
 * Add date.min based on cpython implementation

appveyor.yml

@@ -13,5 +13,8 @@ environment:
 init:
   - "ECHO %PYTHON% %PYTHON_VERSION% %PYTHON_ARCH%"
 
+install:
+  - py -m pip install tzdata
+
 test_script:
-  - "%PYTHON%\\python.exe t/test.py"
+  - py t/test.py

jdatetime/__init__.py

@@ -635,10 +635,7 @@ def strftime(self, format):
 
         try:
             sign = "+"
-            try:
-                diff = self.tzinfo.utcoffset(self)
-            except TypeError:
-                diff = self.tzinfo.utcoffset(None)
+            diff = self.utcoffset()
             diff_sec = diff.seconds
             if diff.days > 0 or diff.days < -1:
                 raise ValueError(
@@ -654,11 +651,9 @@ def strftime(self, format):
         except AttributeError:
             format = format.replace("%z", '')
 
-        try:
-            format = format.replace("%Z", self.tzinfo.tzname(self))
-        except TypeError:
-            format = format.replace("%Z", self.tzinfo.tzname(None))
-        except AttributeError:
+        if hasattr(self, 'tzname') and self.tzname() is not None:
+            format = format.replace("%Z", self.tzname())
+        else:
             format = format.replace("%Z", '')
 
         return format
@@ -1294,13 +1289,13 @@ def timetz(self):
     def tzname(self):
         """Return self.tzinfo.tzname(self)"""
         if self.tzinfo:
-            return self.tzinfo.tzname(self)
+            return self.tzinfo.tzname(self.togregorian())
         return None
 
     def utcoffset(self):
         """Return self.tzinfo.utcoffset(self)."""
         if self.tzinfo:
-            return self.tzinfo.utcoffset(self)
+            return self.tzinfo.utcoffset(self.togregorian())
 
     def utctimetuple(self):
         """Return UTC time tuple, compatible with time.localtime().
@@ -1310,11 +1305,10 @@ def utctimetuple(self):
         return dt.utctimetuple()
 
     def __str__(self):
-        mil = self.strftime("%f")
-        if int(mil) == 0:
+        if self.microsecond == 0:
             mil = ""
         else:
-            mil = "." + mil
+            mil = "." + str(self.microsecond)
         tz = self.strftime("%z")
         return self.strftime("%Y-%m-%d %H:%M:%S") + "%s%s" % (mil, tz)
 

t/test.py

@@ -14,6 +14,12 @@
 except ImportError:
     greenlet_installed = False
 
+try:
+    import zoneinfo
+except ImportError:
+    zoneinfo = None
+
+
 BASEDIR = os.path.abspath(
     os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")
 )
@@ -698,6 +704,12 @@ def test_isoformat_custom_timespec(self):
         self.assertEqual(milliseconds, '1398-04-11T11:06:05.123')
         self.assertEqual(microseconds, '1398-04-11T11:06:05.123456')
 
+    @unittest.skipIf(zoneinfo is None, "ZoneInfo not supported!")
+    def test_zoneinfo_as_timezone(self):
+        tzinfo = zoneinfo.ZoneInfo('Asia/Tehran')
+        jdt = jdatetime.datetime(1398, 4, 11, 11, 6, 5, 123456, tzinfo=tzinfo)
+        self.assertEqual(str(jdt), '1398-04-11 11:06:05.123456+0430')
+
 
 class TestJdatetimeGetSetLocale(unittest.TestCase):
     @staticmethod