Merge branch 'master' into nightly

This commit is contained in:
Nicholas St. Germain 2018-12-18 22:08:21 -06:00 committed by GitHub
commit efa3397332

View file

@ -1,9 +1,9 @@
from hashlib import md5 from hashlib import md5
from tarfile import open as taropen
from datetime import date from datetime import date
from logging import getLogger from logging import getLogger
from calendar import monthcalendar from calendar import monthcalendar
from geoip2.database import Reader from geoip2.database import Reader
from tarfile import open as taropen
from urllib3 import disable_warnings from urllib3 import disable_warnings
from os import stat, remove, makedirs from os import stat, remove, makedirs
from urllib.request import urlretrieve from urllib.request import urlretrieve