Use _strptime and improve strftime (#1702)

slozier · web-flow · commit 0d4b0d842b05 · 2023-06-27T15:30:25.000-04:00
* Use _strptime and improve strftime

* Fix some tests

* Add some tests
diff --git a/Src/DLR b/Src/DLR
@@ -1 +1 @@
-Subproject commit 201479b49963950f3139a31e351633c718d0e0d4
+Subproject commit 2a2b1ac33cc3c3661ad9c2b43019a14ed6b2106f
diff --git a/Src/IronPython.Modules/_datetime.cs b/Src/IronPython.Modules/_datetime.cs
diff --git a/Src/IronPython.Modules/time.cs b/Src/IronPython.Modules/time.cs
diff --git a/Src/IronPython/Runtime/Operations/StringOps.cs b/Src/IronPython/Runtime/Operations/StringOps.cs
@@ -1761,7 +1761,7 @@ internal static string GetEncodingName(Encoding encoding, bool normalize = true,
                     case 65000: name = "utf-7"; break;
                     case 65001: name = "utf-8"; break;
                 }
-#if !NETCOREAPP && !NETSTANDARD
+#if NETFRAMEWORK
                 if (encoding.IsBrowserDisplay) {
                     name = encoding.WebName;
                 }
@@ -1996,7 +1996,7 @@ internal static partial class CodecsInfo {
             internal static readonly IDictionary<string, Lazy<Encoding?>> Codecs;
 
             static CodecsInfo() {
-#if NETCOREAPP || NETSTANDARD
+#if !NETFRAMEWORK
                 // This ensures that Encoding.GetEncoding(0) will return the default Windows ANSI code page
                 Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
 #endif
diff --git a/Src/IronPython/Runtime/PythonContext.cs b/Src/IronPython/Runtime/PythonContext.cs
@@ -1129,6 +1129,15 @@ internal object GetCopyRegModule() {
             return copyRegModule;
         }
 
+        private object strptimeModule;
+
+        internal object GetStrptimeModule() {
+            if (strptimeModule is null) {
+                strptimeModule = Importer.ImportModule(SharedContext, new PythonDictionary(), "_strptime", false, 0);
+            }
+            return strptimeModule;
+        }
+
         public object GetWarningsModule() {
             object warnings = null;
             try {
diff --git a/Src/IronPython/Runtime/Types/DocBuilder.cs b/Src/IronPython/Runtime/Types/DocBuilder.cs
@@ -542,7 +542,7 @@ private static string GetXmlDocLocation(Assembly assem) {
             return location;
         }
 
-#if !NETCOREAPP && !NETSTANDARD
+#if NETFRAMEWORK
         private const string _frameworkReferencePath = @"Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0";
 #endif
 
@@ -571,7 +571,7 @@ private static XPathDocument GetXPathDocument(Assembly asm) {
                 if (!File.Exists(xml)) {
                     xml = Path.Combine(baseDir, baseFile);
                     if (!File.Exists(xml)) {
-#if !NETCOREAPP && !NETSTANDARD
+#if NETFRAMEWORK
                         // On .NET 4.0 documentation is in the reference assembly location
                         // for 64-bit processes, we need to look in Program Files (x86)
                         xml = Path.Combine(
diff --git a/Src/IronPythonTest/Cases/CPythonCasesManifest.ini b/Src/IronPythonTest/Cases/CPythonCasesManifest.ini
@@ -301,7 +301,7 @@ RunCondition=$(IS_POSIX)
 Ignore=true
 Reason=unittest.case.SkipTest: No module named _curses
 
-[CPython.test_datetime] # test_datetime_stdlib
+[CPython.test_datetime] # IronPython.test_datetime_stdlib
 Ignore=true
 
 [CPython.test_dbm_dumb]
@@ -845,16 +845,10 @@ Ignore=true
 [CPython.test_statistics]
 Ignore=true
 
-[CPython.test_strftime]
-Ignore=true
-
 [CPython.test_stringprep]
 Ignore=true
 Reason=Requires unicode 3.2.0 data - https://github.com/IronLanguages/ironpython3/issues/691
 
-[CPython.test_strptime] # IronPython.test_strptime_stdlib
-Ignore=true
-
 [CPython.test_strtod]
 Ignore=true
 Reason=unittest.case.SkipTest: correctly-rounded string->float conversions not available on this system
@@ -950,7 +944,7 @@ RunCondition=$(IS_POSIX)
 Ignore=true
 Reason=unittest.case.SkipTest: Cant test signal on win32
 
-[CPython.test_time]
+[CPython.test_time] # IronPython.test_time_stdlib
 Ignore=true
 
 [CPython.test_timeout]
diff --git a/Src/StdLib/Lib/test/test_strftime.py b/Src/StdLib/Lib/test/test_strftime.py
@@ -185,7 +185,7 @@ class Y1900Tests(unittest.TestCase):
     def test_y_before_1900(self):
         # Issue #13674, #19634
         t = (1899, 1, 1, 0, 0, 0, 0, 0, 0)
-        if (sys.platform == "win32"
+        if not sys.implementation.name == "ironpython" and (sys.platform == "win32"
         or sys.platform.startswith(("aix", "sunos", "solaris"))):
             with self.assertRaises(ValueError):
                 time.strftime("%y", t)
diff --git a/Tests/modules/misc/test_datetime.py b/Tests/modules/misc/test_datetime.py
@@ -1038,13 +1038,13 @@ def test_time(self):
         x = datetime.time(2,28,3,99,None)
         self.assertEqual(x.tzname(), None)
 
-    @skipUnlessIronPython()
     def test_tzinfo(self):
         x = datetime.tzinfo()
         self.assertRaises(NotImplementedError, x.utcoffset, None)
         self.assertRaises(NotImplementedError, x.dst, None)
         self.assertRaises(NotImplementedError, x.tzname, None)
-        self.assertRaises(NotImplementedError, x.fromutc, None)
+        self.assertRaises(TypeError, x.fromutc, None)
+        self.assertRaises(ValueError, x.fromutc, datetime.datetime.now())
 
     def test_invariant(self):
         for x in range(0, 10000, 99):
diff --git a/Tests/modules/system_related/test_time.py b/Tests/modules/system_related/test_time.py
@@ -57,7 +57,10 @@ def test_strftime(self):
                 ]
 
         for dateTime, result in tests:
-            self.assertEqual(time.strftime('%Y-%m-%d %H:%M:%S',time.struct_time(dateTime)), result)
+            self.assertEqual(time.strftime('%Y-%m-%d %H:%M:%S', time.struct_time(dateTime)), result)
+
+        # https://github.com/IronLanguages/ironpython3/issues/1121
+        self.assertTrue(time.strftime("%Z%z")) # make sure it doesn't produce an empty string
 
     def test_strptime(self):
         import time
@@ -77,16 +80,10 @@ def test_strptime(self):
         self.assertEqual((1942, 1, 1, 0, 0, 0, 3, 1, -1), time.strptime("%1942", "%%%Y"))
         self.assertEqual((1900, 1, 6, 0, 0, 0, 5, 6, -1), time.strptime("%6", "%%%d"))
 
-        if is_cli: # https://github.com/IronLanguages/main/issues/239
-            # TODO: day of the week does not work as expected
-            import System.DateTime
-            if System.DateTime(System.DateTime.Now.Year, 7, 9).DayOfWeek == System.DayOfWeek.Friday:
-                self.assertEqual((1900, 7, 9, 19, 30, 0, 4, 190, -1), time.strptime('Fri, July 9 7:30 PM', '%a, %B %d %I:%M %p'))
-            else:
-                with self.assertRaises(ValueError):
-                    time.strptime('Fri, July 9 7:30 PM', '%a, %B %d %I:%M %p')
-        else:
-            self.assertEqual((1900, 7, 9, 19, 30, 0, 4, 190, -1), time.strptime('Fri, July 9 7:30 PM', '%a, %B %d %I:%M %p'))
+        # https://github.com/IronLanguages/main/issues/239
+        self.assertEqual(time.strptime('Fri', '%a'), (1900, 1, 1, 0, 0, 0, 4, 1, -1))
+        for i, d in enumerate(('Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun')):
+            self.assertEqual((1900, 7, 9, 19, 30, 0, i, 190, -1), time.strptime(d + ', July 9 7:30 PM', '%a, %B %d %I:%M %p'))
 
         self.assertEqual((1900, 7, 9, 19, 30, 0, 0, 190, -1), time.strptime('July 9 7:30 PM', '%B %d %I:%M %p'))
         # CPY & IPY differ on daylight savings time for this parse
diff --git a/Tests/test_datetime.py b/Tests/test_datetime.py
@@ -4,6 +4,7 @@
 
 import unittest
 import datetime
+import sys
 import time
 
 from iptest import run_test, skipUnlessIronPython
@@ -46,7 +47,7 @@ def test_strptime_8(self):
     def test_strptime_9(self):
         d = datetime.datetime.strptime('Monday 11. March 2002', "%A %d. %B %Y")
         self.assertEqual(d, datetime.datetime(2002, 3, 11, 0, 0))
-    
+
     def test_strftime_1(self):
         d = datetime.datetime(2013, 11, 29, 16, 38, 12, 507000)
         self.assertEqual(d.strftime("%Y-%m-%dT%H:%M:%S.%f"), "2013-11-29T16:38:12.507000")
@@ -73,7 +74,7 @@ def test_invalid_strptime(self):
 
     def test_strptime_day_of_week(self):
         t = time.strptime("2013", "%Y")
-        self.assertEqual(t, (2013, 1, 1, 0, 0, 0, 1, 1, -1)) 
+        self.assertEqual(t, (2013, 1, 1, 0, 0, 0, 1, 1, -1))
         t = time.strptime("2013-11", "%Y-%m")
         self.assertEqual(t, (2013, 11, 1, 0, 0, 0, 4, 305, -1))
         t = time.strptime("2013-11-29", "%Y-%m-%d")
@@ -132,20 +133,41 @@ def test_System_DateTime_conversion(self):
         example = datetime.datetime(2015, 4, 25, 8, 39, 54)
         result = clr.Convert(example, DateTime)
         self.assertIsInstance(result, DateTime)
-        
+
         expected = DateTime(2015, 4, 25, 8, 39, 54)
         self.assertEqual(expected, result)
-    
+
     @skipUnlessIronPython()
     def test_System_DateTime_binding(self):
         import clr
         from System import DateTime, TimeSpan
         pydt = datetime.datetime(2015, 4, 25, 8, 39, 54)
         netdt = DateTime(2015, 4, 25, 9, 39, 54)
-        
+
         result = netdt.Subtract(pydt)
         expected = TimeSpan(1, 0, 0)
-        
+
         self.assertEqual(expected, result)
 
+    def test_strptime_timezone(self):
+        # https://github.com/IronLanguages/ironpython2/issues/118
+        data = '2015-03-19T16:00:35+0200'
+        dt = datetime.datetime(2015, 3, 19, 16, 0, 35, tzinfo=datetime.timezone(datetime.timedelta(0, 7200)))
+        fmt = '%Y-%m-%dT%H:%M:%S%z'
+        self.assertEqual(datetime.datetime.strptime(data, fmt), dt)
+
+        data = '2015-03-19T16:00:35+02:00'
+        if sys.version_info >= (3,7):
+            self.assertEqual(datetime.datetime.strptime(data, fmt), dt)
+        else:
+            with self.assertRaises(ValueError):
+                datetime.datetime.strptime(data, fmt)
+
+    def test_strftime_timezone(self):
+        # https://github.com/IronLanguages/ironpython3/issues/1121
+        utcoffset = datetime.timedelta(hours=-7)
+        tz = datetime.timezone(utcoffset)
+        dt = datetime.datetime(2001, 9, 23, 20, 10, 55, tzinfo=tz)
+        self.assertEqual(dt.strftime("%Z%z"), 'UTC-07:00-0700')
+
 run_test(__name__)
diff --git a/Tests/test_datetime_stdlib.py b/Tests/test_datetime_stdlib.py
@@ -28,7 +28,6 @@ def load_tests(loader, standard_tests, pattern):
             test.datetimetester.TestDateTime('test_mixed_compare'),
             test.datetimetester.TestDateTime('test_overflow'),
             test.datetimetester.TestDateTime('test_strftime_with_bad_tzname_replace'),
-            test.datetimetester.TestDateTime('test_strptime'),
             test.datetimetester.TestDateTime('test_timestamp_aware'), # AttributeError: 'datetime' object has no attribute 'timestamp'
             test.datetimetester.TestDateTimeTZ('test_astimezone'), # https://github.com/IronLanguages/ironpython3/issues/1136
             test.datetimetester.TestDateTimeTZ('test_backdoor_resistance'),
@@ -41,7 +40,6 @@ def load_tests(loader, standard_tests, pattern):
             test.datetimetester.TestDateTimeTZ('test_mixed_compare'),
             test.datetimetester.TestDateTimeTZ('test_overflow'),
             test.datetimetester.TestDateTimeTZ('test_strftime_with_bad_tzname_replace'),
-            test.datetimetester.TestDateTimeTZ('test_strptime'),
             test.datetimetester.TestDateTimeTZ('test_timestamp_aware'), # AttributeError: 'datetime' object has no attribute 'timestamp'
             test.datetimetester.TestDateTimeTZ('test_tz_aware_arithmetic'),
             test.datetimetester.TestDateTimeTZ('test_utctimetuple'), # SystemError: Object reference not set to an instance of an object.
@@ -59,11 +57,8 @@ def load_tests(loader, standard_tests, pattern):
             test.datetimetester.TestSubclassDateTime('test_timestamp_aware'),
             test.datetimetester.TestSubclassDateTime('test_tz_independent_comparing'),
             test.datetimetester.TestTimeDelta('test_computations'), # rounding differences
-            test.datetimetester.TestTimeTZ('test_mixed_compare'),
             test.datetimetester.TestTimeTZ('test_zones'),
             test.datetimetester.TestTimeZone('test_constructor'),
-            test.datetimetester.TestTimezoneConversions('test_bogus_dst'), # SystemError: Object reference not set to an instance of an object.
-            test.datetimetester.TestTimezoneConversions('test_fromutc'),
         ]
 
         return generate_suite(tests, failing_tests)
diff --git a/Tests/test_strptime_stdlib.py b/Tests/test_strptime_stdlib.py
diff --git a/Tests/test_time_stdlib.py b/Tests/test_time_stdlib.py
@@ -0,0 +1,40 @@
+# Licensed to the .NET Foundation under one or more agreements.
+# The .NET Foundation licenses this file to you under the Apache 2.0 License.
+# See the LICENSE file in the project root for more information.
+
+##
+## Run selected tests from test_time from StdLib
+##
+
+from iptest import is_ironpython, generate_suite, run_test
+
+import test.test_time
+
+def load_tests(loader, standard_tests, pattern):
+    tests = loader.loadTestsFromModule(test.test_time)
+
+    if is_ironpython:
+
+        failing_tests = [
+            test.test_time.TestAsctime4dyear('test_large_year'), # ValueError: year is too high
+            test.test_time.TestAsctime4dyear('test_negative'), # ValueError: year is too low
+            test.test_time.TimeTestCase('test_asctime'), # ValueError: year is too high
+            test.test_time.TimeTestCase('test_asctime_bounding_check'), # ValueError: Hour, Minute, and Second parameters describe an un-representable DateTime.
+            test.test_time.TimeTestCase('test_clock'), # NotImplementedError: get_clock_info('clock')
+            test.test_time.TimeTestCase('test_get_clock_info'), # NotImplementedError: get_clock_info
+            test.test_time.TimeTestCase('test_insane_timestamps'), # ValueError: unreasonable date/time
+            test.test_time.TimeTestCase('test_mktime_error'), # ValueError: year is too low
+            test.test_time.TimeTestCase('test_process_time'), # AttributeError: 'module' object has no attribute 'process_time'
+            test.test_time.TimeTestCase('test_strftime_bounding_check'), # ValueError: Hour, Minute, and Second parameters describe an un-representable DateTime.
+            test.test_time.TimeTestCase('test_time'), # NotImplementedError: get_clock_info('time')
+            test.test_time.TimeTestCase('test_default_values_for_zero'), # AssertionError: '2000 01 01 00 00 00 1 001' != '2000 01 01 00 00 00 6 001'
+        ]
+
+        skip_tests = []
+
+        return generate_suite(tests, failing_tests, skip_tests)
+
+    else:
+        return tests
+
+run_test(__name__)
