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

[josejuan05]

USPS postservice has been failing for me for the past several months. It looks like a problem where if the user hits an Akamai endpoint without having cookies enabled the Akamai server returns a 403(?) error.

I enabled cookies and it solved the problem except for one tracking number (where a location wasn't returned for one of the tracking numbers (9400111699000432487028).

For that number USPS returned a status but not a location, so the parsing code (which splits the result on a newline and uses the first line as the status and the second line as the location) failed because there was no newline, hence there was no second array entry. The proposed code change isn't beautiful, and I'd gladly accept a better solution.

[Vsevolod Velichko (torkvemada)]

review: Approve

[Vsevolod Velichko (torkvemada)]

Great, thanks for your patch. Merged into 18.03.1

=== modified file 'parcel_tracker_lib/postservices/uspscom.py'
--- parcel_tracker_lib/postservices/uspscom.py	2017-11-17 21:46:49 +0000
+++ parcel_tracker_lib/postservices/uspscom.py	2018-03-04 08:05:01 +0000
@@ -32,6 +32,11 @@
     name = "USPS.com"
     url = 'https://tools.usps.com/go/TrackConfirmAction?tLabels=%(number)s'
 
+    def _get_page(self):
+        fields = {'number': self.number}
+        url = self.url % fields
+        return self._fetch_url(url, data=None, headers={}, use_cookies=True)
+
     def _parse_page(self, html):
         html = html.decode('utf-8', 'ignore')
         res = re.search(r'<div id="trackingHistory_1"[^>]*>(.*?)END Body content for \'Tracking History\'', html, re.DOTALL | re.UNICODE)
@@ -49,6 +54,9 @@
             remainder = re.sub(r'\n\s*\n', '\n', unescape(untagify(remainder)).strip(), re.UNICODE)
             remainder = remainder.split('\n')
             operation = remainder[0].strip()
-            location = remainder[1].strip()
+            if len(remainder)>1:
+              location = remainder[1].strip()
+            else:
+              location=''
             result.append((operation, opdate, location))
         return result