@@ -531,38 +531,82 @@ def _create_auto_date_locator(date1, date2):
531
531
532
532
d1 = datetime .datetime (1997 , 1 , 1 )
533
533
results = ([datetime .timedelta (weeks = 52 * 200 ),
534
- [str (t ) for t in range (1980 , 2201 , 20 )]
535
- ],
536
- [datetime .timedelta (weeks = 52 ),
537
- ['1997' , '02/1997' , '03/1997' , '04/1997' , '05/1997' , '06/1997' ,
538
- '07/1997' , '08/1997' , '09/1997' , '10/1997' , '11/1997' , '12/1997' ]
539
- ],
540
- [datetime .timedelta (days = 141 ),
541
- ['01/1997' , 'day: 22' , '02/1997' , 'day: 22' , '03/1997' ,
542
- 'day: 22' , '04/1997' , 'day: 22' , '05/1997' , 'day: 22' ]
543
- ],
544
- [datetime .timedelta (days = 40 ),
545
- ['01/1997' , 'day: 05' , 'day: 09' , 'day: 13' , 'day: 17' , 'day: 21' ,
546
- 'day: 25' , 'day: 29' , '02/1997' , 'day: 05' , 'day: 09' ]
547
- ],
548
- [datetime .timedelta (hours = 40 ),
549
- ['day: 01' ,
550
- '04 hr 00 min' , '08 hr 00 min' , '12 hr 00 min' , '16 hr 00 min' , '20 hr 00 min' , 'day: 02' ,
551
- '04 hr 00 min' , '08 hr 00 min' , '12 hr 00 min' , '16 hr 00 min' ]
552
- ],
553
- [datetime .timedelta (minutes = 20 ),
554
- ['00 hr 00 min' , '00 hr 05 min' , '00 hr 10 min' ,
555
- '00 hr 15 min' , '00 hr 20 min' ]
556
- ],
557
- [datetime .timedelta (seconds = 40 ),
558
- ['00 hr 00 min' , '05.000000 sec' , '10.000000 sec' , '15.000000 sec' , '20.000000 sec' ,
559
- '25.000000 sec' , '30.000000 sec' , '35.000000 sec' , '40.000000 sec' ]
560
- ],
561
- [datetime .timedelta (seconds = 2 ),
562
- ['59.500000 sec' , '00 hr 00 min' , '00.500000 sec' , '01.000000 sec' ,
563
- '01.500000 sec' , '02.000000 sec' , '02.500000 sec' ]
564
- ],
565
- )
534
+ [str (t ) for t in range (1980 ,
535
+ 2201 ,
536
+ 20 )]],
537
+ [datetime .timedelta (weeks = 52 ),
538
+ ['1997' ,
539
+ '02/1997' ,
540
+ '03/1997' ,
541
+ '04/1997' ,
542
+ '05/1997' ,
543
+ '06/1997' ,
544
+ '07/1997' ,
545
+ '08/1997' ,
546
+ '09/1997' ,
547
+ '10/1997' ,
548
+ '11/1997' ,
549
+ '12/1997' ]],
550
+ [datetime .timedelta (days = 141 ),
551
+ ['01/1997' ,
552
+ 'day: 22' ,
553
+ '02/1997' ,
554
+ 'day: 22' ,
555
+ '03/1997' ,
556
+ 'day: 22' ,
557
+ '04/1997' ,
558
+ 'day: 22' ,
559
+ '05/1997' ,
560
+ 'day: 22' ]],
561
+ [datetime .timedelta (days = 40 ),
562
+ ['01/1997' ,
563
+ 'day: 05' ,
564
+ 'day: 09' ,
565
+ 'day: 13' ,
566
+ 'day: 17' ,
567
+ 'day: 21' ,
568
+ 'day: 25' ,
569
+ 'day: 29' ,
570
+ '02/1997' ,
571
+ 'day: 05' ,
572
+ 'day: 09' ]],
573
+ [datetime .timedelta (hours = 40 ),
574
+ ['day: 01' ,
575
+ '04 hr 00 min' ,
576
+ '08 hr 00 min' ,
577
+ '12 hr 00 min' ,
578
+ '16 hr 00 min' ,
579
+ '20 hr 00 min' ,
580
+ 'day: 02' ,
581
+ '04 hr 00 min' ,
582
+ '08 hr 00 min' ,
583
+ '12 hr 00 min' ,
584
+ '16 hr 00 min' ]],
585
+ [datetime .timedelta (minutes = 20 ),
586
+ ['00 hr 00 min' ,
587
+ '00 hr 05 min' ,
588
+ '00 hr 10 min' ,
589
+ '00 hr 15 min' ,
590
+ '00 hr 20 min' ]],
591
+ [datetime .timedelta (seconds = 40 ),
592
+ ['00 hr 00 min' ,
593
+ '05.000000 sec' ,
594
+ '10.000000 sec' ,
595
+ '15.000000 sec' ,
596
+ '20.000000 sec' ,
597
+ '25.000000 sec' ,
598
+ '30.000000 sec' ,
599
+ '35.000000 sec' ,
600
+ '40.000000 sec' ]],
601
+ [datetime .timedelta (seconds = 2 ),
602
+ ['59.500000 sec' ,
603
+ '00 hr 00 min' ,
604
+ '00.500000 sec' ,
605
+ '01.000000 sec' ,
606
+ '01.500000 sec' ,
607
+ '02.000000 sec' ,
608
+ '02.500000 sec' ]],
609
+ )
566
610
for t_delta , expected in results :
567
611
d2 = d1 + t_delta
568
612
strings = _create_auto_date_locator (d1 , d2 )
@@ -576,7 +620,8 @@ def _create_auto_date_locator(date1, date2):
576
620
fig , ax = plt .subplots ()
577
621
578
622
locator = mdates .AutoDateLocator (interval_multiples = True )
579
- formatter = mdates .ConciseDateFormatter (locator , zero_formats = zero_formats )
623
+ formatter = mdates .ConciseDateFormatter (
624
+ locator , zero_formats = zero_formats )
580
625
ax .yaxis .set_major_locator (locator )
581
626
ax .yaxis .set_major_formatter (formatter )
582
627
ax .set_ylim (date1 , date2 )
0 commit comments