diff options
| author | Joffrey F <f.joffrey@gmail.com> | 2015-07-21 10:45:29 -0700 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2015-07-21 10:45:29 -0700 |
| commit | 42b712d1005bb24b776733556ac48d8db69a1dbf (patch) | |
| tree | b381dc1ac8dffd9a675124eb93bac1dfba926e27 /docker/utils/utils.py | |
| parent | 2c08ad21dd9aa0c01936e6184574cd105a2b3f64 (diff) | |
| parent | 657420a4d3b1611cedf37f801e597456133807a2 (diff) | |
| download | docker-py-42b712d1005bb24b776733556ac48d8db69a1dbf.tar.gz | |
Merge pull request #680 from aanand/fix-timestamp-conversion
Enforce UTC datetimes in arguments to `events()`
Diffstat (limited to 'docker/utils/utils.py')
| -rw-r--r-- | docker/utils/utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 10c08de..a714c97 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -339,9 +339,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 |