[GR-12718] time.struct_time takes at most 2 arguments.

PullRequest: graalpython/300

Author: ppisl

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

@@ -38,7 +38,7 @@
 # SOFTWARE.
 
 import time
-
+import unittest
 
 def test_sleep():
     start = time.time()
@@ -56,3 +56,20 @@ def test_monotonic():
     times = [time.monotonic() for _ in range(100)]
     for t1, t2 in zip(times[:-1], times[1:]):
         assert t1 <= t2
+
+class StructTimeTests(unittest.TestCase):
+
+    def test_new_struct_time(self):
+        t = time.struct_time((2018, 11, 26, 17, 34, 12, 0, 340, -1))
+        self.assertEqual(t.tm_year,  2018)
+        self.assertEqual(t.tm_mon, 11)
+        self.assertEqual(t.tm_mday, 26)
+        self.assertEqual(t[2], 26)
+        self.assertEqual(t.tm_zone, None)
+        
+        self.assertRaises(TypeError, time.struct_time, (2018, 11, 26, 17, 34, 12, 0, 340))
+        self.assertRaises(TypeError, time.struct_time, (2018, 11, 26, 17, 34, 12, 0, 340, 9, 10, 11, 12))
+
+    
+
+    

graalpython/lib-graalpython/time.py

@@ -38,30 +38,47 @@
 # SOFTWARE.
 
 
-@__builtin__
-def struct_time(*args, **kwargs):
-    from collections import namedtuple
+def make_struct_time():
+    from _descriptor import make_named_tuple_class
+    fields = ["tm_year", "tm_mon", "tm_mday", "tm_hour", "tm_min", "tm_sec", "tm_wday", "tm_yday", "tm_isdst", "tm_zone", "tm_gmtoff"]
+    struct_time_type = make_named_tuple_class("struct_time", fields)
+
+    class struct_time(struct_time_type):
+
+        def __new__(cls, iterable):
+            count = len(iterable)
+            if (count < 9):
+                raise TypeError("time.struct_time() takes an at least 9-sequence (%d-sequence given)" % count)
+            if (count > 11):
+                raise TypeError("time.struct_time() takes an at most 11-sequence (%d-sequence given)" % count)
+            if count == 11:
+                return tuple.__new__(cls, iterable)
+            if count == 10:
+                return tuple.__new__(cls, iterable + (None, ))
+            if count == 9:
+                return tuple.__new__(cls, iterable + (None,  None)) 
 
-    nt = namedtuple("struct_time", [
-        "tm_year",
-        "tm_mon",
-        "tm_mday",
-        "tm_hour",
-        "tm_min",
-        "tm_sec",
-        "tm_wday",
-        "tm_yday",
-        "tm_isdst",
-    ])
+        def __repr__(self):
+            text = "{}(".format(self.__class__.__name__)
+            n = len(self)
+            for i in range(n):
+                if self[i] != None:
+                    if i > 0 :
+                        text = text + ", "
+                    text = text + "{}={}".format(fields[i], str(self[i]))
+            text = text + ')'
+            return text
+    return struct_time
 
-    return nt(*args, **kwargs)
 
+struct_time = make_struct_time()
+del make_struct_time
 
 @__builtin__
 def gmtime(seconds):
-    return struct_time(*__truffle_gmtime_tuple__(seconds))
+    return struct_time(__truffle_gmtime_tuple__(seconds))
 
 
 @__builtin__
 def localtime(seconds):
-    return struct_time(*__truffle_localtime_tuple__(seconds))
+    return struct_time(__truffle_localtime_tuple__(seconds))