Modify the format of the air waybill number

Supplementing other exception handling

Author: liaohanfei

README.md

@@ -51,7 +51,14 @@ import trackingmore
 
 trackingmore.api_key = 'you api key'
 
-couriers = trackingmore.courier.get_all_couriers()
+try:
+  couriers = trackingmore.courier.get_all_couriers()
+  print(couriers)
+except trackingmore.exception.TrackingMoreException as ce:
+  print(ce)
+except Exception as e:
+  print("other error:", e)
+
 ```
 
 ## Testing
@@ -89,7 +96,7 @@ try:
   couriers = trackingmore.courier.detect(params)
   print(couriers)
 except trackingmore.exception.TrackingMoreException as ce:
-  print(ce)
+  print(ce) 
 
 # Tracking number cannot be empty
 ```
@@ -104,6 +111,9 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
+
 ```
 
 ##### Return a list of matched couriers based on submitted tracking number.
@@ -115,6 +125,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ## Trackings
@@ -127,6 +139,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ##### Get tracking results of multiple trackings.
@@ -141,6 +155,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ##### Create multiple trackings (Max. 40 tracking numbers create in one call).
@@ -153,6 +169,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ##### Update a tracking by ID.
@@ -165,6 +183,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ##### Delete a tracking by ID.
@@ -176,6 +196,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ##### Retrack expired tracking by ID.
@@ -187,6 +209,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 ## Air Waybill
 ##### Create an air waybill.
@@ -198,6 +222,8 @@ try:
   print(result)
 except trackingmore.exception.TrackingMoreException as ce:
   print(ce)
+except Exception as e:
+  print("other error:", e) 
 ```
 
 ## Response Code

example/air_waybill_example.py

@@ -8,6 +8,8 @@ def create_an_air_waybill(params):
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 if __name__ == '__main__':
     params = {'awb_number': '235-69030430'}

example/courier_example.py

@@ -8,13 +8,17 @@ def get_all_couriers():
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def detect(params):
     try:
         result = trackingmore.courier.detect(params)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 if __name__ == '__main__':
     result = get_all_couriers()

example/tracking_example.py

@@ -8,41 +8,53 @@ def create_tracking(params):
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def get_tracking_results(params):
     try:
         result = trackingmore.tracking.get_tracking_results(params)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def batch_create_trackings(params):
     try:
         result = trackingmore.tracking.batch_create_trackings(params)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def update_tracking_by_id(id_string, params):
     try:
         result = trackingmore.tracking.update_tracking_by_id(id_string, params)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def delete_tracking_by_id(id_string):
     try:
         result = trackingmore.tracking.delete_tracking_by_id(id_string)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 def retrack_tracking_by_id(id_string):
     try:
         result = trackingmore.tracking.retrack_tracking_by_id(id_string)
         return result
     except trackingmore.exception.TrackingMoreException as ce:
         print(ce)
+    except Exception as e:
+        print("other error:", e)
 
 if __name__ == '__main__':
     params = {'tracking_number': '92612903029511573030094547','courier_code':'usps'}

trackingmore/air_waybill.py

@@ -1,3 +1,5 @@
+import re
+
 from .const import ErrInvalidAirWaybillFormat, ErrMissingAwbNumber
 
 from .exception import TrackingMoreException
@@ -11,7 +13,9 @@
 def create_an_air_waybill(params):
     if is_empty(params.get('awb_number')):
         raise TrackingMoreException(ErrMissingAwbNumber)
-    if len(params['awb_number']) != 12:
+
+    pattern = r'^\d{3}[ -]?(\d{8})$'
+    if not re.match(pattern, params.get('awb_number')):
         raise TrackingMoreException(ErrInvalidAirWaybillFormat)
     path = '/awb'
     response = make_request('POST', path, params)

trackingmore/const.py

@@ -5,4 +5,4 @@
 ErrMissingAwbNumber           = 'Awb number cannot be empty';
 ErrMaxTrackingNumbersExceeded = 'Max. 40 tracking numbers create in one call';
 ErrEmptyId                    = 'Id cannot be empty';
-ErrInvalidAirWaybillFormat    = 'The air waybill number format is invalid and can only be 12 digits in length';
+ErrInvalidAirWaybillFormat    = 'The air waybill number format is invalid';

trackingmore/request.py

@@ -29,7 +29,7 @@ def get_request_header(apiKey):
     headers['Tracking-Api-Key'] = apiKey
     return headers
 
-def make_request( method='GET', path ='', params=None):
+def make_request(method='GET', path='', params=None):
     try:
         url = get_request_url(path)