From 4997b30193d9b154967c22ad0a744800dc7bbcf3 Mon Sep 17 00:00:00 2001
From: Daniel Black <grooverdan@users.sourceforge.net>
Date: Sun, 15 Sep 2013 23:39:41 +1000
Subject: [PATCH] TST: add datetime method on mytime for rework of datedetector

---
 server/mytime.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/mytime.py b/server/mytime.py
index 8ae85184..554d3544 100644
--- a/server/mytime.py
+++ b/server/mytime.py
@@ -21,7 +21,7 @@ __author__ = "Cyril Jaquier"
 __copyright__ = "Copyright (c) 2004 Cyril Jaquier"
 __license__ = "GPL"
 
-import time
+import time, datetime
 
 ##
 # MyTime class.
@@ -74,6 +74,14 @@ class MyTime:
 			return time.gmtime(MyTime.myTime)
 	gmtime = staticmethod(gmtime)
 
+	#@staticmethod
+	def now():
+		if MyTime.myTime is None:
+			return datetime.now()
+		else:
+			return datetime.datetime.fromtimestamp(MyTime.myTime)
+	now = staticmethod(now)
+
 	def localtime(x=None):
 		if MyTime.myTime is None or x is not None:
 			return time.localtime(x)