From 37f5c18506fad4d6c84785cf6f16c9e93c926ad9 Mon Sep 17 00:00:00 2001 From: AntiCompositeNumber Date: Tue, 21 Jul 2020 22:08:15 -0400 Subject: [PATCH] Revert "Use datetime.datetime in _wayback_timestamp" This reverts commit 5b3038086582e913d525200d68abc68ab05458e7. Introduced unnecessary complexity --- waybackpy/wrapper.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/waybackpy/wrapper.py b/waybackpy/wrapper.py index 7a69475..4b4296d 100644 --- a/waybackpy/wrapper.py +++ b/waybackpy/wrapper.py @@ -36,9 +36,11 @@ def _archive_url_parser(header): ) -def _wayback_timestamp(dt): +def _wayback_timestamp(**kwargs): """Return a formatted timestamp.""" - return dt.strftime("%Y%m%d%h%m") + return "".join( + str(kwargs[key]).zfill(2) for key in ["year", "month", "day", "hour", "minute"] + ) class Url: @@ -111,14 +113,14 @@ class Url: Supported params are year, month, day, hour and minute. Any non-supplied parameters default to the current time. """ - kwargs = { - key: val - for key, val in dict( - year=year, month=month, day=day, hour=hour, minute=minute - ) - if val is not None - } - timestamp = _wayback_timestamp(datetime.utcnow().replace(**kwargs)) + now = datetime.utcnow().timetuple() + timestamp = _wayback_timestamp( + year=year if year else now.tm_year, + month=month if month else now.tm_mon, + day=day if day else now.tm_mday, + hour=hour if hour else now.tm_hour, + minute=minute if minute else now.tm_min, + ) request_url = "https://archive.org/wayback/available?url=%s×tamp=%s" % ( self._clean_url(),