diff options
| author | Devin Carlen <devin.carlen@gmail.com> | 2010-07-28 18:24:52 +0000 |
|---|---|---|
| committer | Devin Carlen <devin.carlen@gmail.com> | 2010-07-28 18:24:52 +0000 |
| commit | d425ee86d389e8972a4e30ce5d26f1b3de96ebb7 (patch) | |
| tree | 0117336e3e0aa0295895ff8fcd8853dbc933f81c /nova/utils.py | |
| parent | e53caccb7a242bdabd4ea6aed914ab77cb1fca32 (diff) | |
| parent | a72fb79080df79306d947347e0ceb9be238c5cd8 (diff) | |
| download | nova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.tar.gz nova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.tar.xz nova-d425ee86d389e8972a4e30ce5d26f1b3de96ebb7.zip | |
Merged trunk
Diffstat (limited to 'nova/utils.py')
| -rw-r--r-- | nova/utils.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/nova/utils.py b/nova/utils.py index 9ecceafe0..a1eb0a092 100644 --- a/nova/utils.py +++ b/nova/utils.py @@ -20,7 +20,7 @@ System-level utilities and helper functions. """ -from datetime import datetime +from datetime import datetime, timedelta import inspect import logging import os @@ -32,7 +32,7 @@ import sys from nova import flags FLAGS = flags.FLAGS - +TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ" def fetchfile(url, target): logging.debug("Fetching %s" % url) @@ -118,4 +118,7 @@ def get_my_ip(): def isotime(at=None): if not at: at = datetime.utcnow() - return at.strftime("%Y-%m-%dT%H:%M:%SZ") + return at.strftime(TIME_FORMAT) + +def parse_isotime(timestr): + return datetime.strptime(timestr, TIME_FORMAT) |