@@ -643,16 +643,16 @@ check_date_args(int year, int month, int day)
643
643
return -1 ;
644
644
}
645
645
if (month < 1 || month > 12 ) {
646
- PyErr_SetString (PyExc_ValueError ,
647
- "month must be in 1..12, but got %d" ,
648
- month );
646
+ PyErr_Format (PyExc_ValueError ,
647
+ "month must be in 1..12, but got %d" ,
648
+ month );
649
649
return -1 ;
650
650
}
651
- int dim = days_in_month (year , month )
651
+ int dim = days_in_month (year , month );
652
652
if (day < 1 || day > dim ) {
653
- PyErr_SetString (PyExc_ValueError ,
654
- "day must be in 1..%d, but got %d" ,
655
- dim , day );
653
+ PyErr_Format (PyExc_ValueError ,
654
+ "day must be in 1..%d, but got %d" ,
655
+ dim , day );
656
656
return -1 ;
657
657
}
658
658
return 0 ;
@@ -665,28 +665,28 @@ static int
665
665
check_time_args (int h , int m , int s , int us , int fold )
666
666
{
667
667
if (h < 0 || h > 23 ) {
668
- PyErr_SetString (PyExc_ValueError ,
669
- "hour must be in 0..23, but got %i" , h );
668
+ PyErr_Format (PyExc_ValueError ,
669
+ "hour must be in 0..23, but got %i" , h );
670
670
return -1 ;
671
671
}
672
672
if (m < 0 || m > 59 ) {
673
- PyErr_SetString (PyExc_ValueError ,
674
- "minute must be in 0..59, but got %i" , m );
673
+ PyErr_Format (PyExc_ValueError ,
674
+ "minute must be in 0..59, but got %i" , m );
675
675
return -1 ;
676
676
}
677
677
if (s < 0 || s > 59 ) {
678
- PyErr_SetString (PyExc_ValueError ,
679
- "second must be in 0..59, but got %i" , s );
678
+ PyErr_Format (PyExc_ValueError ,
679
+ "second must be in 0..59, but got %i" , s );
680
680
return -1 ;
681
681
}
682
682
if (us < 0 || us > 999999 ) {
683
- PyErr_SetString (PyExc_ValueError ,
684
- "microsecond must be in 0..999999, but got %i" , us );
683
+ PyErr_Format (PyExc_ValueError ,
684
+ "microsecond must be in 0..999999, but got %i" , us );
685
685
return -1 ;
686
686
}
687
687
if (fold != 0 && fold != 1 ) {
688
- PyErr_SetString (PyExc_ValueError ,
689
- "fold must be either 0 or 1, but got %i" , fold );
688
+ PyErr_Format (PyExc_ValueError ,
689
+ "fold must be either 0 or 1, but got %i" , fold );
690
690
return -1 ;
691
691
}
692
692
return 0 ;
0 commit comments