formatting and improved zero_formats test

Steven Munn · Steven Munn · commit 2f68893bf4c8 · 2020-01-14T18:48:26.000-08:00
diff --git a/lib/matplotlib/tests/test_dates.py b/lib/matplotlib/tests/test_dates.py
@@ -535,77 +535,28 @@ def _create_auto_date_locator(date1, date2):
     2201,
     20)]],
     [datetime.timedelta(weeks=52),
-    ['1997',
-    '02/1997',
-    '03/1997',
-    '04/1997',
-    '05/1997',
-    '06/1997',
-    '07/1997',
-    '08/1997',
-    '09/1997',
-    '10/1997',
-    '11/1997',
-    '12/1997']],
+    ['1997', '02/1997', '03/1997', '04/1997', '05/1997', '06/1997',
+    '07/1997', '08/1997', '09/1997', '10/1997', '11/1997', '12/1997']],
     [datetime.timedelta(days=141),
-    ['01/1997',
-    'day: 22',
-    '02/1997',
-    'day: 22',
-    '03/1997',
-    'day: 22',
-    '04/1997',
-    'day: 22',
-    '05/1997',
-    'day: 22']],
+    ['01/1997', 'day: 22', '02/1997', 'day: 22', '03/1997', 'day: 22',
+    '04/1997', 'day: 22', '05/1997', 'day: 22']],
     [datetime.timedelta(days=40),
-    ['01/1997',
-    'day: 05',
-    'day: 09',
-    'day: 13',
-    'day: 17',
-    'day: 21',
-    'day: 25',
-    'day: 29',
-    '02/1997',
-    'day: 05',
-    'day: 09']],
+    ['01/1997', 'day: 05', 'day: 09', 'day: 13', 'day: 17', 'day: 21',
+    'day: 25', 'day: 29', '02/1997', 'day: 05', 'day: 09']],
     [datetime.timedelta(hours=40),
-    ['day: 01',
-    '04 hr 00 min',
-    '08 hr 00 min',
-    '12 hr 00 min',
-    '16 hr 00 min',
-    '20 hr 00 min',
-    'day: 02',
-    '04 hr 00 min',
-    '08 hr 00 min',
-    '12 hr 00 min',
-    '16 hr 00 min']],
+    ['day: 01', '04 hr 00 min', '08 hr 00 min', '12 hr 00 min',
+    '16 hr 00 min', '20 hr 00 min', 'day: 02', '04 hr 00 min',
+    '08 hr 00 min', '12 hr 00 min', '16 hr 00 min']],
     [datetime.timedelta(minutes=20),
-    ['00 hr 00 min',
-    '00 hr 05 min',
-    '00 hr 10 min',
-    '00 hr 15 min',
+    ['00 hr 00 min', '00 hr 05 min', '00 hr 10 min', '00 hr 15 min',
     '00 hr 20 min']],
     [datetime.timedelta(seconds=40),
-    ['00 hr 00 min',
-    '05.000000 sec',
-    '10.000000 sec',
-    '15.000000 sec',
-    '20.000000 sec',
-    '25.000000 sec',
-    '30.000000 sec',
-    '35.000000 sec',
+    ['00 hr 00 min', '05.000000 sec', '10.000000 sec', '15.000000 sec',
+    '20.000000 sec', '25.000000 sec', '30.000000 sec', '35.000000 sec',
     '40.000000 sec']],
     [datetime.timedelta(seconds=2),
-    ['59.500000 sec',
-    '00 hr 00 min',
-    '00.500000 sec',
-    '01.000000 sec',
-    '01.500000 sec',
-    '02.000000 sec',
-    '02.500000 sec']],
+    ['59.500000 sec', '00 hr 00 min', '00.500000 sec', '01.000000 sec',
+    '01.500000 sec', '02.000000 sec', '02.500000 sec']],
      )
     for t_delta, expected in results:
         d2 = d1 + t_delta
@@ -614,7 +565,7 @@ def _create_auto_date_locator(date1, date2):
 
 
 def test_concise_formatter_zformats():
-    zero_formats = ['', "'%y", '%B', '%m-%d', '%S', '.%f']
+    zero_formats = ['', "'%y", '%B', '%m-%d', '%S', '%S.%f']
 
     def _create_auto_date_locator(date1, date2):
         fig, ax = plt.subplots()
@@ -655,10 +606,10 @@ def _create_auto_date_locator(date1, date2):
                 ['00', '00:05', '00:10', '00:15', '00:20']
                 ],
                [datetime.timedelta(seconds=40),
-                ['', '05', '10', '15', '20', '25', '30', '35', '40']
+                ['00', '05', '10', '15', '20', '25', '30', '35', '40']
                 ],
                [datetime.timedelta(seconds=2),
-                ['59.5', '.0', '00.5', '01.0', '01.5', '02.0', '02.5']
+                ['59.5', '00.0', '00.5', '01.0', '01.5', '02.0', '02.5']
                 ],
                )
     for t_delta, expected in results:
