PyTransportNSWv2 1.0.3__tar.gz → 1.0.4__tar.gz

{PyTransportNSWv2-1.0.3 → PyTransportNSWv2-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 1.0.3
+Version: 1.0.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-1.0.3 → PyTransportNSWv2-1.0.4}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 1.0.3
+Version: 1.0.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-1.0.3 → PyTransportNSWv2-1.0.4}/TransportNSWv2/TransportNSWv2.py

@@ -88,15 +88,15 @@ class TransportNSWv2(object):
         stop_list = []
         skip_api_calls = False
 
-        for stop in stops:
-            url = \
-                'https://api.transport.nsw.gov.au/v1/tp/stop_finder?' \
-                'outputFormat=rapidJSON&coordOutputFormat=EPSG%3A4326' \
-                '&type_sf=stop&name_sf=' + stop + \
-                '&TfNSWSF=true'
-
-            # Send the query
-            try:
+        try:
+            for stop in stops:
+                url = \
+                    'https://api.transport.nsw.gov.au/v1/tp/stop_finder?' \
+                    'outputFormat=rapidJSON&coordOutputFormat=EPSG%3A4326' \
+                    '&type_sf=stop&name_sf=' + stop + \
+                    '&TfNSWSF=true'
+
+                # Send the query
                 url = 'https://api.transport.nsw.gov.au/v1/tp/stop_finder?outputFormat=rapidJSON&coordOutputFormat=EPSG%3A4326&type_sf=stop&name_sf=' + stop + '&TfNSWSF=true'
                 error_code = 0
 
@@ -124,7 +124,6 @@ class TransportNSWv2(object):
                 else:
                     # Parse the result as a JSON object
                     stop_detail = response.json()
-
                     # Just a quick check - the presence of systemMessages signifies an error, otherwise we assume it's ok
                     if 'systemMessages' in stop_detail:
                         error_text = stop_detail['systemMessages'][0]['text']
@@ -134,10 +133,6 @@ class TransportNSWv2(object):
                     # Not usually an issue but if multiple processes are running multiple calls we might hit it
                     time.sleep(1.0)
 
-            except Exception as ex:
-                raise StopError(f"Error '{ex}' calling stop finder API for stop ID {stop}", stop)
-
-            finally:
                 # Append the results to the JSON output - only return the 'isBest' location entry if there's more than one
                 if stop_detail != []:
                     stop_valid = True
@@ -154,10 +149,19 @@ class TransportNSWv2(object):
                 data = {"stop_id": stop, "valid": stop_valid, "error_code": error_code, "stop_detail": stop_detail}
                 stop_list.append (data)
 
-        # Complete the JSON output and return it
-        data = {"all_stops_valid": all_stops_valid, "stop_list": stop_list}
-        #return json.dumps(data)
-        return data
+            # Complete the JSON output and return it
+            data = {"all_stops_valid": all_stops_valid, "stop_list": stop_list}
+
+            return data
+
+        except InvalidAPIKey as ex:
+            raise InvalidAPIKey (f"Invalid API key {api_key}")
+
+        except StopError as ex:
+            raise StopError (f"Error '{ex}' calling stop finder API for stop ID {stop}")
+
+        except Exception as ex:
+            raise StopError(f"Error '{ex}' calling stop finder API for stop ID {stop}", stop)
 
 
     def get_trip(self, name_origin, name_destination , api_key, journey_wait_time = 0, transport_type = 0, \

{PyTransportNSWv2-1.0.3 → PyTransportNSWv2-1.0.4}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="1.0.3",
+    version="1.0.4",
     author="andystewart999",
     author_email="andy.stewart@live.com",
     description="Get detailed per-trip transport information from TransportNSW",