11from test import support
2- import time
3- import unittest
2+ import enum
43import locale
5- import sysconfig
6- import sys
74import platform
5+ import sys
6+ import sysconfig
7+ import time
8+ import unittest
89try :
910 import threading
1011except ImportError :
1415SIZEOF_INT = sysconfig .get_config_var ('SIZEOF_INT' ) or 4
1516TIME_MAXYEAR = (1 << 8 * SIZEOF_INT - 1 ) - 1
1617TIME_MINYEAR = - TIME_MAXYEAR - 1
17- _PyTime_ROUND_DOWN = 0
18- _PyTime_ROUND_UP = 1
18+
19+
20+ class _PyTime (enum .IntEnum ):
21+ # Round towards zero
22+ ROUND_DOWN = 0
23+ # Round away from zero
24+ ROUND_UP = 1
25+
26+ ALL_ROUNDING_METHODS = (_PyTime .ROUND_UP , _PyTime .ROUND_DOWN )
1927
2028
2129class TimeTestCase (unittest .TestCase ):
@@ -596,23 +604,23 @@ def test_time_t(self):
596604 from _testcapi import pytime_object_to_time_t
597605 for obj , time_t , rnd in (
598606 # Round towards zero
599- (0 , 0 , _PyTime_ROUND_DOWN ),
600- (- 1 , - 1 , _PyTime_ROUND_DOWN ),
601- (- 1.0 , - 1 , _PyTime_ROUND_DOWN ),
602- (- 1.9 , - 1 , _PyTime_ROUND_DOWN ),
603- (1.0 , 1 , _PyTime_ROUND_DOWN ),
604- (1.9 , 1 , _PyTime_ROUND_DOWN ),
607+ (0 , 0 , _PyTime . ROUND_DOWN ),
608+ (- 1 , - 1 , _PyTime . ROUND_DOWN ),
609+ (- 1.0 , - 1 , _PyTime . ROUND_DOWN ),
610+ (- 1.9 , - 1 , _PyTime . ROUND_DOWN ),
611+ (1.0 , 1 , _PyTime . ROUND_DOWN ),
612+ (1.9 , 1 , _PyTime . ROUND_DOWN ),
605613 # Round away from zero
606- (0 , 0 , _PyTime_ROUND_UP ),
607- (- 1 , - 1 , _PyTime_ROUND_UP ),
608- (- 1.0 , - 1 , _PyTime_ROUND_UP ),
609- (- 1.9 , - 2 , _PyTime_ROUND_UP ),
610- (1.0 , 1 , _PyTime_ROUND_UP ),
611- (1.9 , 2 , _PyTime_ROUND_UP ),
614+ (0 , 0 , _PyTime . ROUND_UP ),
615+ (- 1 , - 1 , _PyTime . ROUND_UP ),
616+ (- 1.0 , - 1 , _PyTime . ROUND_UP ),
617+ (- 1.9 , - 2 , _PyTime . ROUND_UP ),
618+ (1.0 , 1 , _PyTime . ROUND_UP ),
619+ (1.9 , 2 , _PyTime . ROUND_UP ),
612620 ):
613621 self .assertEqual (pytime_object_to_time_t (obj , rnd ), time_t )
614622
615- rnd = _PyTime_ROUND_DOWN
623+ rnd = _PyTime . ROUND_DOWN
616624 for invalid in self .invalid_values :
617625 self .assertRaises (OverflowError ,
618626 pytime_object_to_time_t , invalid , rnd )
@@ -622,44 +630,44 @@ def test_timeval(self):
622630 from _testcapi import pytime_object_to_timeval
623631 for obj , timeval , rnd in (
624632 # Round towards zero
625- (0 , (0 , 0 ), _PyTime_ROUND_DOWN ),
626- (- 1 , (- 1 , 0 ), _PyTime_ROUND_DOWN ),
627- (- 1.0 , (- 1 , 0 ), _PyTime_ROUND_DOWN ),
628- (1e-6 , (0 , 1 ), _PyTime_ROUND_DOWN ),
629- (1e-7 , (0 , 0 ), _PyTime_ROUND_DOWN ),
630- (- 1e-6 , (- 1 , 999999 ), _PyTime_ROUND_DOWN ),
631- (- 1e-7 , (- 1 , 999999 ), _PyTime_ROUND_DOWN ),
632- (- 1.2 , (- 2 , 800000 ), _PyTime_ROUND_DOWN ),
633- (0.9999999 , (0 , 999999 ), _PyTime_ROUND_DOWN ),
634- (0.0000041 , (0 , 4 ), _PyTime_ROUND_DOWN ),
635- (1.1234560 , (1 , 123456 ), _PyTime_ROUND_DOWN ),
636- (1.1234569 , (1 , 123456 ), _PyTime_ROUND_DOWN ),
637- (- 0.0000040 , (- 1 , 999996 ), _PyTime_ROUND_DOWN ),
638- (- 0.0000041 , (- 1 , 999995 ), _PyTime_ROUND_DOWN ),
639- (- 1.1234560 , (- 2 , 876544 ), _PyTime_ROUND_DOWN ),
640- (- 1.1234561 , (- 2 , 876543 ), _PyTime_ROUND_DOWN ),
633+ (0 , (0 , 0 ), _PyTime . ROUND_DOWN ),
634+ (- 1 , (- 1 , 0 ), _PyTime . ROUND_DOWN ),
635+ (- 1.0 , (- 1 , 0 ), _PyTime . ROUND_DOWN ),
636+ (1e-6 , (0 , 1 ), _PyTime . ROUND_DOWN ),
637+ (1e-7 , (0 , 0 ), _PyTime . ROUND_DOWN ),
638+ (- 1e-6 , (- 1 , 999999 ), _PyTime . ROUND_DOWN ),
639+ (- 1e-7 , (- 1 , 999999 ), _PyTime . ROUND_DOWN ),
640+ (- 1.2 , (- 2 , 800000 ), _PyTime . ROUND_DOWN ),
641+ (0.9999999 , (0 , 999999 ), _PyTime . ROUND_DOWN ),
642+ (0.0000041 , (0 , 4 ), _PyTime . ROUND_DOWN ),
643+ (1.1234560 , (1 , 123456 ), _PyTime . ROUND_DOWN ),
644+ (1.1234569 , (1 , 123456 ), _PyTime . ROUND_DOWN ),
645+ (- 0.0000040 , (- 1 , 999996 ), _PyTime . ROUND_DOWN ),
646+ (- 0.0000041 , (- 1 , 999995 ), _PyTime . ROUND_DOWN ),
647+ (- 1.1234560 , (- 2 , 876544 ), _PyTime . ROUND_DOWN ),
648+ (- 1.1234561 , (- 2 , 876543 ), _PyTime . ROUND_DOWN ),
641649 # Round away from zero
642- (0 , (0 , 0 ), _PyTime_ROUND_UP ),
643- (- 1 , (- 1 , 0 ), _PyTime_ROUND_UP ),
644- (- 1.0 , (- 1 , 0 ), _PyTime_ROUND_UP ),
645- (1e-6 , (0 , 1 ), _PyTime_ROUND_UP ),
646- (1e-7 , (0 , 1 ), _PyTime_ROUND_UP ),
647- (- 1e-6 , (- 1 , 999999 ), _PyTime_ROUND_UP ),
648- (- 1e-7 , (- 1 , 999999 ), _PyTime_ROUND_UP ),
649- (- 1.2 , (- 2 , 800000 ), _PyTime_ROUND_UP ),
650- (0.9999999 , (1 , 0 ), _PyTime_ROUND_UP ),
651- (0.0000041 , (0 , 5 ), _PyTime_ROUND_UP ),
652- (1.1234560 , (1 , 123457 ), _PyTime_ROUND_UP ),
653- (1.1234569 , (1 , 123457 ), _PyTime_ROUND_UP ),
654- (- 0.0000040 , (- 1 , 999996 ), _PyTime_ROUND_UP ),
655- (- 0.0000041 , (- 1 , 999995 ), _PyTime_ROUND_UP ),
656- (- 1.1234560 , (- 2 , 876544 ), _PyTime_ROUND_UP ),
657- (- 1.1234561 , (- 2 , 876543 ), _PyTime_ROUND_UP ),
650+ (0 , (0 , 0 ), _PyTime . ROUND_UP ),
651+ (- 1 , (- 1 , 0 ), _PyTime . ROUND_UP ),
652+ (- 1.0 , (- 1 , 0 ), _PyTime . ROUND_UP ),
653+ (1e-6 , (0 , 1 ), _PyTime . ROUND_UP ),
654+ (1e-7 , (0 , 1 ), _PyTime . ROUND_UP ),
655+ (- 1e-6 , (- 1 , 999999 ), _PyTime . ROUND_UP ),
656+ (- 1e-7 , (- 1 , 999999 ), _PyTime . ROUND_UP ),
657+ (- 1.2 , (- 2 , 800000 ), _PyTime . ROUND_UP ),
658+ (0.9999999 , (1 , 0 ), _PyTime . ROUND_UP ),
659+ (0.0000041 , (0 , 5 ), _PyTime . ROUND_UP ),
660+ (1.1234560 , (1 , 123457 ), _PyTime . ROUND_UP ),
661+ (1.1234569 , (1 , 123457 ), _PyTime . ROUND_UP ),
662+ (- 0.0000040 , (- 1 , 999996 ), _PyTime . ROUND_UP ),
663+ (- 0.0000041 , (- 1 , 999995 ), _PyTime . ROUND_UP ),
664+ (- 1.1234560 , (- 2 , 876544 ), _PyTime . ROUND_UP ),
665+ (- 1.1234561 , (- 2 , 876543 ), _PyTime . ROUND_UP ),
658666 ):
659667 with self .subTest (obj = obj , round = rnd , timeval = timeval ):
660668 self .assertEqual (pytime_object_to_timeval (obj , rnd ), timeval )
661669
662- rnd = _PyTime_ROUND_DOWN
670+ rnd = _PyTime . ROUND_DOWN
663671 for invalid in self .invalid_values :
664672 self .assertRaises (OverflowError ,
665673 pytime_object_to_timeval , invalid , rnd )
@@ -669,38 +677,38 @@ def test_timespec(self):
669677 from _testcapi import pytime_object_to_timespec
670678 for obj , timespec , rnd in (
671679 # Round towards zero
672- (0 , (0 , 0 ), _PyTime_ROUND_DOWN ),
673- (- 1 , (- 1 , 0 ), _PyTime_ROUND_DOWN ),
674- (- 1.0 , (- 1 , 0 ), _PyTime_ROUND_DOWN ),
675- (1e-9 , (0 , 1 ), _PyTime_ROUND_DOWN ),
676- (1e-10 , (0 , 0 ), _PyTime_ROUND_DOWN ),
677- (- 1e-9 , (- 1 , 999999999 ), _PyTime_ROUND_DOWN ),
678- (- 1e-10 , (- 1 , 999999999 ), _PyTime_ROUND_DOWN ),
679- (- 1.2 , (- 2 , 800000000 ), _PyTime_ROUND_DOWN ),
680- (0.9999999999 , (0 , 999999999 ), _PyTime_ROUND_DOWN ),
681- (1.1234567890 , (1 , 123456789 ), _PyTime_ROUND_DOWN ),
682- (1.1234567899 , (1 , 123456789 ), _PyTime_ROUND_DOWN ),
683- (- 1.1234567890 , (- 2 , 876543211 ), _PyTime_ROUND_DOWN ),
684- (- 1.1234567891 , (- 2 , 876543210 ), _PyTime_ROUND_DOWN ),
680+ (0 , (0 , 0 ), _PyTime . ROUND_DOWN ),
681+ (- 1 , (- 1 , 0 ), _PyTime . ROUND_DOWN ),
682+ (- 1.0 , (- 1 , 0 ), _PyTime . ROUND_DOWN ),
683+ (1e-9 , (0 , 1 ), _PyTime . ROUND_DOWN ),
684+ (1e-10 , (0 , 0 ), _PyTime . ROUND_DOWN ),
685+ (- 1e-9 , (- 1 , 999999999 ), _PyTime . ROUND_DOWN ),
686+ (- 1e-10 , (- 1 , 999999999 ), _PyTime . ROUND_DOWN ),
687+ (- 1.2 , (- 2 , 800000000 ), _PyTime . ROUND_DOWN ),
688+ (0.9999999999 , (0 , 999999999 ), _PyTime . ROUND_DOWN ),
689+ (1.1234567890 , (1 , 123456789 ), _PyTime . ROUND_DOWN ),
690+ (1.1234567899 , (1 , 123456789 ), _PyTime . ROUND_DOWN ),
691+ (- 1.1234567890 , (- 2 , 876543211 ), _PyTime . ROUND_DOWN ),
692+ (- 1.1234567891 , (- 2 , 876543210 ), _PyTime . ROUND_DOWN ),
685693 # Round away from zero
686- (0 , (0 , 0 ), _PyTime_ROUND_UP ),
687- (- 1 , (- 1 , 0 ), _PyTime_ROUND_UP ),
688- (- 1.0 , (- 1 , 0 ), _PyTime_ROUND_UP ),
689- (1e-9 , (0 , 1 ), _PyTime_ROUND_UP ),
690- (1e-10 , (0 , 1 ), _PyTime_ROUND_UP ),
691- (- 1e-9 , (- 1 , 999999999 ), _PyTime_ROUND_UP ),
692- (- 1e-10 , (- 1 , 999999999 ), _PyTime_ROUND_UP ),
693- (- 1.2 , (- 2 , 800000000 ), _PyTime_ROUND_UP ),
694- (0.9999999999 , (1 , 0 ), _PyTime_ROUND_UP ),
695- (1.1234567890 , (1 , 123456790 ), _PyTime_ROUND_UP ),
696- (1.1234567899 , (1 , 123456790 ), _PyTime_ROUND_UP ),
697- (- 1.1234567890 , (- 2 , 876543211 ), _PyTime_ROUND_UP ),
698- (- 1.1234567891 , (- 2 , 876543210 ), _PyTime_ROUND_UP ),
694+ (0 , (0 , 0 ), _PyTime . ROUND_UP ),
695+ (- 1 , (- 1 , 0 ), _PyTime . ROUND_UP ),
696+ (- 1.0 , (- 1 , 0 ), _PyTime . ROUND_UP ),
697+ (1e-9 , (0 , 1 ), _PyTime . ROUND_UP ),
698+ (1e-10 , (0 , 1 ), _PyTime . ROUND_UP ),
699+ (- 1e-9 , (- 1 , 999999999 ), _PyTime . ROUND_UP ),
700+ (- 1e-10 , (- 1 , 999999999 ), _PyTime . ROUND_UP ),
701+ (- 1.2 , (- 2 , 800000000 ), _PyTime . ROUND_UP ),
702+ (0.9999999999 , (1 , 0 ), _PyTime . ROUND_UP ),
703+ (1.1234567890 , (1 , 123456790 ), _PyTime . ROUND_UP ),
704+ (1.1234567899 , (1 , 123456790 ), _PyTime . ROUND_UP ),
705+ (- 1.1234567890 , (- 2 , 876543211 ), _PyTime . ROUND_UP ),
706+ (- 1.1234567891 , (- 2 , 876543210 ), _PyTime . ROUND_UP ),
699707 ):
700708 with self .subTest (obj = obj , round = rnd , timespec = timespec ):
701709 self .assertEqual (pytime_object_to_timespec (obj , rnd ), timespec )
702710
703- rnd = _PyTime_ROUND_DOWN
711+ rnd = _PyTime . ROUND_DOWN
704712 for invalid in self .invalid_values :
705713 self .assertRaises (OverflowError ,
706714 pytime_object_to_timespec , invalid , rnd )
@@ -759,5 +767,91 @@ def test_short_times(self):
759767 self .assertIs (lt .tm_zone , None )
760768
761769
770+ @support .cpython_only
771+ class TestPyTime_t (unittest .TestCase ):
772+ def test_FromSecondsObject (self ):
773+ from _testcapi import pytime_fromsecondsobject
774+ SEC_TO_NS = 10 ** 9
775+ MAX_SEC = 2 ** 63 // 10 ** 9
776+
777+ # Conversion giving the same result for all rounding methods
778+ for rnd in ALL_ROUNDING_METHODS :
779+ for obj , ts in (
780+ # integers
781+ (0 , 0 ),
782+ (1 , SEC_TO_NS ),
783+ (- 3 , - 3 * SEC_TO_NS ),
784+
785+ # float: subseconds
786+ (0.0 , 0 ),
787+ (1e-9 , 1 ),
788+ (1e-6 , 10 ** 3 ),
789+ (1e-3 , 10 ** 6 ),
790+
791+ # float: seconds
792+ (2.0 , 2 * SEC_TO_NS ),
793+ (123.0 , 123 * SEC_TO_NS ),
794+ (- 7.0 , - 7 * SEC_TO_NS ),
795+
796+ # nanosecond are kept for value <= 2^23 seconds
797+ (2 ** 22 - 1e-9 , 4194303999999999 ),
798+ (2 ** 22 , 4194304000000000 ),
799+ (2 ** 22 + 1e-9 , 4194304000000001 ),
800+ (2 ** 23 - 1e-9 , 8388607999999999 ),
801+ (2 ** 23 , 8388608000000000 ),
802+
803+ # start loosing precision for value > 2^23 seconds
804+ (2 ** 23 + 1e-9 , 8388608000000002 ),
805+
806+ # nanoseconds are lost for value > 2^23 seconds
807+ (2 ** 24 - 1e-9 , 16777215999999998 ),
808+ (2 ** 24 , 16777216000000000 ),
809+ (2 ** 24 + 1e-9 , 16777216000000000 ),
810+ (2 ** 25 - 1e-9 , 33554432000000000 ),
811+ (2 ** 25 , 33554432000000000 ),
812+ (2 ** 25 + 1e-9 , 33554432000000000 ),
813+
814+ # close to 2^63 nanoseconds
815+ (9223372036 , 9223372036 * SEC_TO_NS ),
816+ (9223372036.0 , 9223372036 * SEC_TO_NS ),
817+ (- 9223372036 , - 9223372036 * SEC_TO_NS ),
818+ (- 9223372036.0 , - 9223372036 * SEC_TO_NS ),
819+ ):
820+ with self .subTest (obj = obj , round = rnd , timestamp = ts ):
821+ self .assertEqual (pytime_fromsecondsobject (obj , rnd ), ts )
822+
823+ with self .subTest (round = rnd ):
824+ with self .assertRaises (OverflowError ):
825+ pytime_fromsecondsobject (9223372037 , rnd )
826+ pytime_fromsecondsobject (9223372037.0 , rnd )
827+ pytime_fromsecondsobject (- 9223372037 , rnd )
828+ pytime_fromsecondsobject (- 9223372037.0 , rnd )
829+
830+ # Conversion giving different results depending on the rounding method
831+ UP = _PyTime .ROUND_UP
832+ DOWN = _PyTime .ROUND_DOWN
833+ for obj , ts , rnd in (
834+ # close to zero
835+ ( 1e-10 , 1 , UP ),
836+ ( 1e-10 , 0 , DOWN ),
837+ (- 1e-10 , 0 , DOWN ),
838+ (- 1e-10 , - 1 , UP ),
839+
840+ # test rounding of the last nanosecond
841+ ( 1.1234567899 , 1123456790 , UP ),
842+ ( 1.1234567899 , 1123456789 , DOWN ),
843+ (- 1.1234567899 , - 1123456789 , DOWN ),
844+ (- 1.1234567899 , - 1123456790 , UP ),
845+
846+ # close to 1 second
847+ ( 0.9999999999 , 1000000000 , UP ),
848+ ( 0.9999999999 , 999999999 , DOWN ),
849+ (- 0.9999999999 , - 999999999 , DOWN ),
850+ (- 0.9999999999 , - 1000000000 , UP ),
851+ ):
852+ with self .subTest (obj = obj , round = rnd , timestamp = ts ):
853+ self .assertEqual (pytime_fromsecondsobject (obj , rnd ), ts )
854+
855+
762856if __name__ == "__main__" :
763857 unittest .main ()
0 commit comments