Merge lp:~josejuan05/parcel-tracker/quickly_branch into lp:parcel-tracker

[josejuan05]

Updated the USPS postservice

[lp:~josejuan05/parcel-tracker/quickly_branch]

444. By josejuan05 on 2017-04-05

Updated USPS postservice added whitespace stripping

[Vsevolod Velichko (torkvemada)]

review: Approve

=== modified file 'parcel_tracker_lib/postservices/uspscom.py'
--- parcel_tracker_lib/postservices/uspscom.py	2016-09-16 11:08:21 +0000
+++ parcel_tracker_lib/postservices/uspscom.py	2017-04-05 05:49:05 +0000
@@ -34,18 +34,18 @@
 
     def _parse_page(self, html):
         html = html.decode('utf-8', 'ignore')
-        res = re.search(r'<table[^>]*id="tc-hits".*?<tbody[^>]*>(.*?)</tbody>', html, re.DOTALL | re.UNICODE)
+        res = re.search(r'<table[^>]*class="tracking_history".*?<tbody[^>]*>(.*?)</tbody>', html, re.DOTALL | re.UNICODE)
         if res is None:
             return []
         html = res.group(1)
         result = []
-        for res in re.findall(r'<td class="date-time">\s*<p>(.*?)</p>\s*</td>\s*<td class="status">\s*(<!--.*?-->)?\s*<p[^>]*>\s*(<span[^>]*>)?(.*?)<.*?\s*(</p)?\s*</td>\s*<td class="location">\s*<p>(.*?)</td>', html, re.DOTALL | re.UNICODE):
+        for res in re.findall(r'<tr[^>]*?>\s*<td>\s*(.*?)\s*</td>\s*<td>\s*(.*?)\s*?</td>\s*<td>\s*(.*?)\s*</td>\s*</tr>', html, re.DOTALL | re.UNICODE):
             opdate, operation, location = (
                 re.sub('\s+',
                        ' ',
-                       unescape(untagify(x.strip())).replace('\n', ' '),
+                       unescape(untagify(x.strip())).replace('\n', ' ').strip(),
                        flags=re.UNICODE)
-                for x in (res[0], res[3], res[5])
+                for x in (res[0], res[1], res[2])
             )
             opdate = parsedate(opdate)
             result.append((operation, opdate, location))