From 7739f7d2f05d32b35ddeef39b864e9c1524fa6d4 Mon Sep 17 00:00:00 2001 From: Stephen Soltesz Date: Tue, 29 Jun 2010 22:09:48 +0000 Subject: [PATCH] moved Time() class to generic.py --- monitor/common.py | 21 --------------------- monitor/generic.py | 23 +++++++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) diff --git a/monitor/common.py b/monitor/common.py index 178c8b2..2eb2bb7 100644 --- a/monitor/common.py +++ b/monitor/common.py @@ -282,24 +282,3 @@ def found_within(recent_actions, action_type, within): print "%s NOT found_within %s in recent_actions" % (action_type, timedelta(within) ) return False - -class Time: - @classmethod - def dt_to_ts(cls, dt): - t = time.mktime(dt.timetuple()) - return t - - @classmethod - def ts_to_dt(cls, ts): - d = datetime.fromtimestamp(ts) - return d - - @classmethod - def str_to_dt(cls, date_str, format="%Y-%m-%d %H:%M:%S"): - dt = datetime.strptime(date_str[:date_str.find('.')], format) - return dt - - @classmethod - def str_to_ts(cls, date_str, format="%Y-%m-%d %H:%M:%S"): - ts = time.mktime(time.strptime(date_str[:date_str.find('.')], format)) - return ts diff --git a/monitor/generic.py b/monitor/generic.py index 50488e9..657c865 100644 --- a/monitor/generic.py +++ b/monitor/generic.py @@ -1,4 +1,5 @@ import sys +from datetime import datetime, timedelta def d_from_l(l, key, using=None, key_as=str, using_as=None): d = {} @@ -66,3 +67,25 @@ def dsn_from_dsln(d_sites, id2lb, l_nodes): hn2lb[hostname] = login_base return (dsn, hn2lb, lb2hn) + + +class Time: + @classmethod + def dt_to_ts(cls, dt): + t = time.mktime(dt.timetuple()) + return t + + @classmethod + def ts_to_dt(cls, ts): + d = datetime.fromtimestamp(ts) + return d + + @classmethod + def str_to_dt(cls, date_str, format="%Y-%m-%d %H:%M:%S"): + dt = datetime.strptime(date_str[:date_str.find('.')], format) + return dt + + @classmethod + def str_to_ts(cls, date_str, format="%Y-%m-%d %H:%M:%S"): + ts = time.mktime(time.strptime(date_str[:date_str.find('.')], format)) + return ts -- 2.43.0