You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@climate.apache.org by jo...@apache.org on 2014/06/08 05:24:12 UTC
[1/2] git commit: CLIMATE-470 - Update time base parsing string with
new format
Repository: climate
Updated Branches:
refs/heads/master 86131eba6 -> a09757ff2
CLIMATE-470 - Update time base parsing string with new format
- Add a new string format for time base parsing to handle date strings
of the form "1999-1-1 0".
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/5290df2e
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/5290df2e
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/5290df2e
Branch: refs/heads/master
Commit: 5290df2ebc509e97aa83031df9b6f6945dc1951d
Parents: 86131eb
Author: Michael Joyce <jo...@apache.org>
Authored: Sat Jun 7 20:11:49 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Sat Jun 7 20:11:49 2014 -0700
----------------------------------------------------------------------
ocw/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/climate/blob/5290df2e/ocw/utils.py
----------------------------------------------------------------------
diff --git a/ocw/utils.py b/ocw/utils.py
index 4a01f78..38a399f 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 %H:%M:%S.%f'
+ '%Y:%m:%d', '%Y%m%d', '%Y-%m-%d %H:%M:%S.%f', '%Y-%m-%d %H',
]
# Attempt to match the base time string with a possible format parsing string.
[2/2] git commit: Resolve CLIMATE-470. Merge PR #70.
Posted by jo...@apache.org.
Resolve CLIMATE-470. Merge PR #70.
Project: http://git-wip-us.apache.org/repos/asf/climate/repo
Commit: http://git-wip-us.apache.org/repos/asf/climate/commit/a09757ff
Tree: http://git-wip-us.apache.org/repos/asf/climate/tree/a09757ff
Diff: http://git-wip-us.apache.org/repos/asf/climate/diff/a09757ff
Branch: refs/heads/master
Commit: a09757ff22723c19ccd61fb049d8c833586b68a1
Parents: 86131eb 5290df2
Author: Michael Joyce <jo...@apache.org>
Authored: Sat Jun 7 20:23:41 2014 -0700
Committer: Michael Joyce <jo...@apache.org>
Committed: Sat Jun 7 20:23:41 2014 -0700
----------------------------------------------------------------------
ocw/utils.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------