From 9185c070ebdf8d0c20a8ec0868c0092ce0996338 Mon Sep 17 00:00:00 2001
From: Enrico Labedzki <enrico.labedzki@deiwos.de>
Date: Wed, 1 May 2013 02:25:05 +0200
Subject: [PATCH] changed from DateASSPlike class to DateStrptime

---
 server/datedetector.py |  6 +++---
 server/datetemplate.py | 19 -------------------
 2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/server/datedetector.py b/server/datedetector.py
index 33270105..8ece81fb 100644
--- a/server/datedetector.py
+++ b/server/datedetector.py
@@ -29,7 +29,7 @@ __license__ = "GPL"
 
 import time, logging
 
-from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601, DateASSPlike
+from datetemplate import DateStrptime, DateTai64n, DateEpoch, DateISO8601
 from threading import Lock
 
 # Gets the instance of the logger.
@@ -162,8 +162,8 @@ class DateDetector:
 			template.setPattern("%y%m%d %H:%M:%S")
 			self._appendTemplate(template)
 			# ASSP: Apr-27-13 02:33:06
-			template = DateASSPlike()
-			template.setName("ASSP like date format")
+			template = DateStrptime()
+			template.setName("Month-Day-Year Hour:Minute:Second")
 			template.setRegex("^[a-zA-Z]{3}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}")
 			template.setPattern("%b-%d-%y %H:%M:%S")
 			self._appendTemplate(template)
diff --git a/server/datetemplate.py b/server/datetemplate.py
index dccd6419..01492755 100644
--- a/server/datetemplate.py
+++ b/server/datetemplate.py
@@ -220,22 +220,3 @@ class DateISO8601(DateTemplate):
 		return date
 
 
-class DateASSPlike(DateTemplate):
-
-	def __init__(self):
-		DateTemplate.__init__(self)
-		self.__pattern = ""
-
-	def setPattern(self, pattern):
-		self.__pattern = pattern.strip()
-
-	def getPattern(self):
-		return self.__pattern
-
-	def getDate(self, line):
-		date = None
-		dateMatch = self.matchDate(line)
-		if dateMatch:
-			date = list(time.strptime(dateMatch.group(), self.getPattern()))
-		return date
-