PyTransportNSWv2 0.8.3__tar.gz → 0.8.4__tar.gz

{PyTransportNSWv2-0.8.3 → PyTransportNSWv2-0.8.4}/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.3
+Version: 0.8.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
+Author-email: andy.stewart@live.com
 License: UNKNOWN
 Description: # TransportNSWv2
         Python lib to access Transport NSW information.
@@ -147,7 +148,7 @@ Description: # TransportNSWv2
         Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
         
         ### Rate limits ###
-        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but due if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
         
         ## Thank you
         Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.3 → PyTransportNSWv2-0.8.4}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,9 +1,10 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.3
+Version: 0.8.4
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999
+Author-email: andy.stewart@live.com
 License: UNKNOWN
 Description: # TransportNSWv2
         Python lib to access Transport NSW information.
@@ -147,7 +148,7 @@ Description: # TransportNSWv2
         Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
         
         ### Rate limits ###
-        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but due if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+        By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
         
         ## Thank you
         Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.3 → PyTransportNSWv2-0.8.4}/README.md

@@ -140,7 +140,7 @@ Note also that the origin and destination details are just that - information ab
 Also note that the 'transport_type' filter, if present, only makes sure that at least **one** leg of the journey includes that transport type unless ```strict_transport_type``` is True, in which case the **first** leg must be of the requested type to be returned.
 
 ### Rate limits ###
-By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but due if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
+By default the TransportNSW API allows each API key to make 60,000 calls in a day and up to 5 calls per second.  Usually this wouldn't be an issue but if you're requesting real-time location data for buses, because I haven't found an elegant way to map the bus route to the correct API URL (and there are about 14) it's brute-forcing it by iterating through ALL the possible URLs until it finds the appropriate journey or it runs out of URLs.  From version 0.8.2 I've added in a 0.5 second delay between loops until I can find a better approach.
 
 ## Thank you
 Thank you Dav0815 for your TransportNSW library that the vast majority of this fork is based on.  I couldn't have done it without you!

{PyTransportNSWv2-0.8.3 → PyTransportNSWv2-0.8.4}/TransportNSWv2/TransportNSWv2.py

@@ -121,7 +121,11 @@ class TransportNSWv2(object):
 
             # If we get bad status code, log error and return with n/a or an empty string
             if response.status_code != 200:
-                logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; check api key")
+                if response.status_code == 429:
+                    logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; rate limit exceeded")
+                else:
+                    logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; check api key")
+
                 return None
 
             # Parse the result as a JSON object
@@ -190,7 +194,6 @@ class TransportNSWv2(object):
             if ((journey is None) or (journey['legs']) is None):
                 pass
             else:
-                print (journey)
                 legs = journey['legs']
                 first_leg = self.find_first_leg(legs, transport_type, strict_transport_type, route_filter)
 
@@ -213,8 +216,6 @@ class TransportNSWv2(object):
                 t2 = datetime.strptime(origin_departure_time_planned, fmt).timestamp()
                 delay = int((t1-t2) / 60)
 
-                #print (origin_departure_time - origin_departure_time_planned)
-
                 # How long until it leaves?
                 due = self.get_due(datetime.strptime(origin_departure_time, fmt))
 
@@ -445,17 +446,13 @@ class TransportNSWv2(object):
         leg_count = len(legs)
         found_alerts = []
         priority_minimum = self.get_alert_priority(priority_filter)
-        print ("priority_minimum = " + str(priority_minimum))
         alert_list = alert_type.split("|")
 
         for leg_index in range (0, leg_count, 1):
             current_leg = legs[leg_index]
             if 'infos' in current_leg:
-                print ("Found 'infos' in leg")
-                print (current_leg['infos'])
                 alerts = current_leg['infos']
                 for alert in alerts:
-                    print ("Found alert")
                     if (self.get_alert_priority(alert['priority'])) >= priority_minimum:
                         if (alert_type == 'all') or (alert['type'].lower() in alert_list):
                             found_alerts.append (alert)
@@ -471,14 +468,7 @@ class TransportNSWv2(object):
             current_leg = legs[leg_index]
             leg_class = current_leg['transportation']['product']['class']
             if 'hints' in current_leg:
-                #print ("")
-                #print ("Found hint(s) for leg " + str(leg_index) )
                 hints = current_leg['hints']
-                #for hint in hints:
-                    #print ("Hint:")
-                    #print (hint)
-                    #print (" ")
-
 
 
     def get_mode(self, iconId):

{PyTransportNSWv2-0.8.3 → PyTransportNSWv2-0.8.4}/setup.py

@@ -5,8 +5,9 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="0.8.3",
+    version="0.8.4",
     author="andystewart999",
+    author_email="andy.stewart@live.com",
     description="Get detailed per-trip transport information from TransportNSW",
     long_description=long_description,
     long_description_content_type="text/markdown",