From 657420a4d3b1611cedf37f801e597456133807a2 Mon Sep 17 00:00:00 2001 From: Aanand Prasad Date: Mon, 20 Jul 2015 10:34:05 +0100 Subject: [PATCH] Enforce UTC datetimes in arguments to `events()` Signed-off-by: Aanand Prasad --- docker/utils/utils.py | 6 +++--- docs/api.md | 4 ++-- tests/test.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 175a7e0ff6..075965c704 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -333,9 +333,9 @@ def convert_filters(filters): return json.dumps(result) -def datetime_to_timestamp(dt=datetime.now()): - """Convert a datetime in local timezone to a unix timestamp""" - delta = dt - datetime.fromtimestamp(0) +def datetime_to_timestamp(dt): + """Convert a UTC datetime to a Unix timestamp""" + delta = dt - datetime.utcfromtimestamp(0) return delta.seconds + delta.days * 24 * 3600 diff --git a/docs/api.md b/docs/api.md index f1e2d034fd..013ea169e3 100644 --- a/docs/api.md +++ b/docs/api.md @@ -251,8 +251,8 @@ function return a blocking generator you can iterate over to retrieve events as **Params**: -* since (datetime or int): get events from this point -* until (datetime or int): get events until this point +* since (UTC datetime or int): get events from this point +* until (UTC datetime or int): get events until this point * filters (dict): filter the events by event time, container or image * decode (bool): If set to true, stream will be decoded into dicts on the fly. False by default. diff --git a/tests/test.py b/tests/test.py index f6535b2e23..9d4b403426 100644 --- a/tests/test.py +++ b/tests/test.py @@ -221,7 +221,7 @@ def test_events(self): def test_events_with_since_until(self): ts = 1356048000 - now = datetime.datetime.fromtimestamp(ts) + now = datetime.datetime.utcfromtimestamp(ts) since = now - datetime.timedelta(seconds=10) until = now + datetime.timedelta(seconds=10) try: