Merge lp:~chsn/parcel-tracker/posten-new into lp:parcel-tracker

[Erik Christiansson]

=== modified file 'parcel_tracker_lib/postservices/postense.py'
--- parcel_tracker_lib/postservices/postense.py	2013-06-26 08:41:31 +0000
+++ parcel_tracker_lib/postservices/postense.py	2013-10-30 14:09:53 +0000
@@ -24,24 +24,13 @@
 import re
 from dateutil.parser import parse as parsedate
 
-
 class PostenSeService(TrackingService):
     """Swedish postal service"""
 
     name = 'Posten.se'
-    url = 'http://www.posten.se/tracktrace/TrackConsignments_do.jsp?trackntraceAction=saveSearch&consignmentId=%(number)s&lang=GB'
+    url = 'http://server.logistik.posten.se/servlet/PacTrack?lang=GB&kolliid=%(number)s'
 
     def _parse_page(self, html):
         html = html.decode('ISO-8859-1', 'ignore')
-        res = re.search(r'<table\s+class="result".*?</th></tr>(.*?)</table>', html, re.DOTALL)
-        if res is None:
-            return []
-        html = res.group(1)
-        result = []
-        for res in re.findall('<tr[^>]*>\s*<td[^>]*>(.*?)</td>\s*<td[^>]*>(.*?), (.*?)</td>\s*</tr>', html, re.DOTALL):
-            opdate, location, action = (x.strip() for x in res)
-            opdate = parsedate(opdate.replace('kl ', ''))
-            action = re.sub('\s+', ' ', action)
-            location = re.sub('\s+', ' ', location)
-            result.append((action, opdate, location))
-        return result
+        return [(r[3], parsedate('%s %s' % (r[0], r[1])), r[2]) for r in re.findall(r'<event>.*?<date>(.*?)</date>.*?<time>(.*?)</time>.*?<location>(.*?)</location>.*?<description>(.*?)</description>.*?</event>', html, re.DOTALL)]
+