Fix time.strftime() and implement missing formatters - G, V, u

Author: andrykonchin

graalpython/com.oracle.graal.python.test/src/tests/test_time.py

@@ -242,7 +242,7 @@ def test_sec(self):
         self.assertRaises(ValueError, time.strftime, "%S", time.struct_time((2018, 8, 2, 10, -1, 30, 1, 1, 0)))
         self.assertRaises(ValueError, time.strftime, "%S", time.struct_time((2018, 8, 2, 24, 62, 30, 1, 1, 0)))
 
-    def test_weekDay(self):
+    def test_weekDayw(self):
         self.check_format("%w", (2018, 11, 28, 10, 0, 0, -1, 1, 0), '0')
         self.check_format("%w", (2018, 11, 28, 10, 0, 0, 0, 1, 0), '1')
         self.check_format("%w", (2018, 11, 25, 11, 12, 2, 3, 1, 0), '4')
@@ -251,6 +251,20 @@ def test_weekDay(self):
         self.check_format("%w", (2018, 11, 24, 23, 20, 61, 999, 1, 0), '6')
         self.assertRaises(ValueError, time.strftime, "%w", time.struct_time((2018, 8, 2, 10, 20, 30, -2, 1, 0)))
 
+    def test_weekDayu(self):
+        self.check_format("%u", (2018, 11, 28, 10, 0, 0, 2, 332, -1), '3')
+        self.check_format("%u", (2018, 11, 25, 11, 12, 2, 6, 329, -1), '7')
+        self.check_format("%u", (2018, 11, 24, 23, 20, 0, 5, 328, -1), '6')
+        self.assertRaises(ValueError, time.strftime, "%u", time.struct_time((2018, 8, 2, 10, 20, 30, -2, 1, 0)))
+
+    def test_week_of_yearU(self):
+        self.check_format("%U", (2018, 11, 28, 0, 0, 0, 2, 332, -1), '47')
+        self.check_format("%U", (2018, 1, 7, 0, 0, 0, 6, 7, -1), '01')
+
+    def test_week_of_yearV(self):
+        self.check_format("%V", (2018, 11, 28, 0, 0, 0, 2, 332, -1), '48')
+        self.check_format("%V", (2018, 1, 7, 0, 0, 0, 6, 7, -1), '01')
+
     def test_YearY(self):
         self.check_format("%Y", (2018, 11, 28, 10, 0, 0, -1, 1, 0), '2018')
         self.check_format("%Y", (18, 11, 28, 10, 0, 0, 0, 1, 0), '18')
@@ -266,11 +280,18 @@ def test_Yeary(self):
         #self.check_format("%y", (-365, 11, 24, 23, 20, 61, 6, 1, 0), '65')
         self.check_format("%y", (17829, 11, 24, 23, 20, 61, 7, 1, 0), '29')
 
+    def test_YearG(self):
+        self.check_format("%G", (2024, 1, 1, 1, 1, 1, 1, 1, 1), '2024') # Jan 1, 2024 is Monday
+
     def test_wrongInput(self):
         self.assertRaises(TypeError, time.strftime, 10, (2018, 8, 2, 10, 20, 30, -2, 1, 0))
         self.assertRaises(TypeError, time.strftime, "%w", 10)
         self.assertRaises(TypeError, time.strftime, "%w", (2018, 11, 29))
 
+    def test_trailing_percent(self):
+        self.check_format("%", (2018, 8, 8, 0, 24, 0, 3, 1, 0), "%")
+        self.check_format("abc%", (2018, 8, 8, 0, 24, 0, 3, 1, 0), "abc%")
+
     def test_padding(self):
         self.check_format("%d", (2018, 8, 8, 5, 24, 10, 3, 1, 0), '08')
         self.check_format("%-d", (2018, 8, 8, 5, 24, 10, 3, 1, 0), '8')

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TimeModuleBuiltins.java

@@ -39,11 +39,13 @@
 import java.lang.management.ManagementFactory;
 import java.text.DateFormatSymbols;
 import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.Month;
 import java.time.Year;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.temporal.IsoFields;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.List;
@@ -761,6 +763,7 @@ private static TruffleString format(String format, int[] date, TruffleString.Fro
                     // there's a bare % at the end of the string. Python lets
                     // this go by just sticking a % at the end of the result
                     // string
+                    s = s + format.substring(lastc, i);
                     s = s + "%";
                     break;
                 }
@@ -807,6 +810,12 @@ private static TruffleString format(String format, int[] date, TruffleString.Fro
                         // day of month (01-31)
                         s = s + (pad ? format("%02d", date[TM_MDAY]) : format("%d", date[TM_MDAY]));
                         break;
+                    case 'G': {
+                        LocalDate localDate = LocalDate.of(date[TM_YEAR], date[TM_MON], date[TM_MDAY]);
+                        j = localDate.get(IsoFields.WEEK_BASED_YEAR);
+                        s = s + format("%04d", j);
+                        break;
+                    }
                     case 'H':
                         // hour (00-23)
                         s = s + (pad ? format("%02d", date[TM_HOUR]) : format("%d", date[TM_HOUR]));
@@ -845,6 +854,12 @@ private static TruffleString format(String format, int[] date, TruffleString.Fro
                         // seconds (00-61)
                         s = s + (pad ? format("%02d", date[TM_SEC]) : format("%d", date[TM_SEC]));
                         break;
+                    case 'u': {
+                        LocalDate localDate = LocalDate.of(date[TM_YEAR], date[TM_MON], date[TM_MDAY]);
+                        j = localDate.getDayOfWeek().getValue();
+                        s = s + format("%d", j);
+                        break;
+                    }
                     case 'U':
                         // week of year (sunday is first day) (00-53). all days in
                         // new year preceding first sunday are considered to be in
@@ -864,6 +879,12 @@ private static TruffleString format(String format, int[] date, TruffleString.Fro
                         }
                         s = s + (pad ? format("%02d", j) : format("%d", j));
                         break;
+                    case 'V': {
+                        LocalDate localDate = LocalDate.of(date[TM_YEAR], date[TM_MON], date[TM_MDAY]);
+                        j = localDate.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR);
+                        s = s + format("%02d", j);
+                        break;
+                    }
                     case 'w':
                         // weekday as decimal (0=Sunday-6)
                         j = (date[TM_WDAY] + 1) % 7;
@@ -934,9 +955,7 @@ private static TruffleString format(String format, int[] date, TruffleString.Fro
                         s = s + "%";
                         break;
                     default:
-                        // TBD: should this raise a ValueError?
                         s = s + "%" + format.charAt(i);
-                        i++;
                         break;
                 }
                 lastc = i + 1;