Update.

[python.git] / covid19.py

diff --git a/covid19.py b/covid19.py
index 78c81ed..fdfe16e 100755 (executable)
--- a/covid19.py
+++ b/covid19.py
@@ -13,75 +13,77 @@ import urllib.request
 
 ######################################################################
 
-def gentle_download(url, delay = 86400):
-    filename = url[url.rfind('/') + 1:]
+
+def gentle_download(url, delay=86400):
+    filename = url[url.rfind("/") + 1 :]
     if not os.path.isfile(filename) or os.path.getmtime(filename) < time.time() - delay:
-        print(f'Retrieving {url}')
+        print(f"Retrieving {url}")
         urllib.request.urlretrieve(url, filename)
     return filename
 
+
 ######################################################################
 
 nbcases_filename = gentle_download(
-    'https://github.com/CSSEGISandData/COVID-19/raw/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-Confirmed.csv'
+    "https://raw.githubusercontent.com/CSSEGISandData/COVID-19/master/csse_covid_19_data/csse_covid_19_time_series/time_series_covid19_confirmed_global.csv"
 )
 
 ######################################################################
 
-with open(nbcases_filename, newline='') as csvfile:
-    reader = csv.reader(csvfile, delimiter=',')
+with open(nbcases_filename, newline="") as csvfile:
+    reader = csv.reader(csvfile, delimiter=",")
     times = []
     nb_cases = {}
     time_col = 5
     for row_nb, row in enumerate(reader):
         for col_nb, field in enumerate(row):
             if row_nb == 0 and col_nb >= time_col:
-                times.append(time.mktime(time.strptime(field, '%m/%d/%y')))
+                times.append(time.mktime(time.strptime(field, "%m/%d/%y")))
             if row_nb >= 1:
                 if col_nb == 1:
                     country = field
                     if not country in nb_cases:
                         nb_cases[country] = numpy.zeros(len(times))
                 elif col_nb >= time_col:
+                    # if field == '': field = '0'
                     nb_cases[country][col_nb - time_col] += int(field)
 
 countries = list(nb_cases.keys())
 countries.sort()
-print('Countries: ', countries)
+print("Countries: ", countries)
 
-nb_cases['World'] = sum(nb_cases.values())
+nb_cases["World"] = sum(nb_cases.values())
 
 ######################################################################
 
 fig = plt.figure()
 ax = fig.add_subplot(1, 1, 1)
 
-ax.yaxis.grid(color='gray', linestyle='-', linewidth=0.25)
-ax.set_title('Nb. of COVID-19 cases')
-ax.set_xlabel('Date', labelpad = 10)
-ax.set_yscale('log')
+ax.yaxis.grid(color="gray", linestyle="-", linewidth=0.25)
+ax.set_title("Nb. of COVID-19 cases")
+ax.set_xlabel("Date", labelpad=10)
+ax.set_yscale("log")
 
-myFmt = mdates.DateFormatter('%b %d')
+myFmt = mdates.DateFormatter("%b %d")
 
 ax.xaxis.set_major_formatter(myFmt)
 dates = mdates.epoch2num(times)
 
 for key, color, label in [
-        ('World', 'blue', 'World'),
-        ('Switzerland', 'red', 'Switzerland'),
-        ('France', 'lightgreen', 'France'),
-        ('US', 'black', 'USA'),
-        ('Korea, South', 'gray', 'South Korea'),
-        ('Italy', 'purple', 'Italy'),
-        ('China', 'orange', 'China')
+    ("World", "blue", "World"),
+    ("Switzerland", "red", "Switzerland"),
+    ("France", "lightgreen", "France"),
+    ("US", "black", "USA"),
+    ("Korea, South", "gray", "South Korea"),
+    ("Italy", "purple", "Italy"),
+    ("China", "orange", "China"),
 ]:
-    ax.plot(dates, nb_cases[key],
-            color = color, label = label, linewidth = 2)
+    ax.plot(dates, nb_cases[key], color=color, label=label, linewidth=2)
 
-ax.legend(frameon = False)
+ax.legend(frameon=False)
 
 plt.show()
 
-fig.savefig('covid19_nb_cases.png')
+fig.savefig("covid19_nb_cases.png")
 
 ######################################################################