Repository: climate Updated Branches: refs/heads/master bf0006034 -> 0742e68e8
CLIMATE-398 - Fix date format parsing problem Project: http://git-wip-us.apache.org/repos/asf/climate/repo Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/0d841797 Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/0d841797 Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/0d841797 Branch: refs/heads/master Commit: 0d84179736c42756675e24cffcb74da99d043c7e Parents: bf00060 Author: Michael Joyce <[email protected]> Authored: Sat Apr 5 10:01:01 2014 -0700 Committer: Michael Joyce <[email protected]> Committed: Sat Apr 5 10:01:01 2014 -0700 ---------------------------------------------------------------------- ocw/data_source/local.py | 2 +- ocw/utils.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/climate/blob/0d841797/ocw/data_source/local.py ---------------------------------------------------------------------- diff --git a/ocw/data_source/local.py b/ocw/data_source/local.py index 8499499..651bd11 100644 --- a/ocw/data_source/local.py +++ b/ocw/data_source/local.py @@ -46,7 +46,7 @@ def _get_time_base(time_format, since_index): '%Y:%m:%d %H:%M:%S', '%Y-%m-%d %H-%M-%S', '%Y/%m/%d %H/%M/%S','%Y-%m-%d %H:%M:%S', '%Y/%m/%d %H:%M:%S', '%Y%m%d %H:%M:%S', '%Y%m%d%H%M%S', '%Y-%m-%d-%H-%M-%S', '%Y/%m/%d/%H/%M/%S', '%Y:%m:%d:%H:%M:%S', '%Y-%m-%d-%H:%M:%S', '%Y-%m-%d %H:%M:%S', '%Y/%m/%d%H:%M:%S', '%Y-%m-%d %H:%M','%Y/%m/%d %H:%M', '%Y:%m:%d %H:%M','%Y%m%d %H:%M', - '%Y-%m-%d', '%Y/%m/%d', '%Y:%m:%d', '%Y%m%d' + '%Y-%m-%d', '%Y/%m/%d', '%Y:%m:%d', '%Y%m%d', '%Y-%m-%d %H:%M:%S.%f' ] count = 0 for time_format in TIME_FORMATS: http://git-wip-us.apache.org/repos/asf/climate/blob/0d841797/ocw/utils.py ---------------------------------------------------------------------- diff --git a/ocw/utils.py b/ocw/utils.py index 4b8f7fe..7c35422 100644 --- a/ocw/utils.py +++ b/ocw/utils.py @@ -111,7 +111,7 @@ def parse_time_base(time_format): '%Y:%m:%d:%H:%M:%S', '%Y-%m-%d-%H:%M:%S', '%Y-%m-%d %H:%M:%S', '%Y/%m/%d%H:%M:%S', '%Y-%m-%d %H:%M', '%Y/%m/%d %H:%M', '%Y:%m:%d %H:%M', '%Y%m%d %H:%M', '%Y-%m-%d', '%Y/%m/%d', - '%Y:%m:%d', '%Y%m%d' + '%Y:%m:%d', '%Y%m%d', '%Y-%m-%d %H:%M:%S.%f' ] # Attempt to match the base time string with a possible format parsing string.
