Closer to pep8

[gigfinder] / resultsparser.py

diff --git a/resultsparser.py b/resultsparser.py
index 7d2835a..793cb4c 100644 (file)
--- a/resultsparser.py
+++ b/resultsparser.py
@@ -4,11 +4,11 @@ import time
 
 import location
 
-def parse_json(json, lat, long):
+def parse_json(json, lat, lng):
     """ Parse json into usable format """
     pass
 
-def parse_xml(xml, lat, long):
+def parse_xml(xml, lat, lng):
     """ Parse xml into a dict """
     events_list = []
     today = date.today()
@@ -16,7 +16,8 @@ def parse_xml(xml, lat, long):
 
     events = dom.getElementsByTagName('event')
     for event in events:
-        start_date = parse_date(event.getElementsByTagName('startDate')[0].childNodes[0].data)
+        start_date = parse_date(event.getElementsByTagName('startDate')[0]\
+                .childNodes[0].data)
         if start_date.date() == today:
             title = event.getElementsByTagName('title')[0].childNodes[0].data
             
@@ -26,14 +27,17 @@ def parse_xml(xml, lat, long):
                 artist_list.append(artist.childNodes[0].data)
             artists = ', '.join(artist_list)
 
-            venue_details = event.getElementsByTagName('venue')[0]
-            venue_name = venue_details.getElementsByTagName('name')[0].childNodes[0].data
-            address = get_address(venue_details.getElementsByTagName('location')[0])
-            geo_data = venue_details.getElementsByTagName('geo:point')[0]
-            venue_lat = geo_data.getElementsByTagName('geo:lat')[0].childNodes[0].data
-            venue_long = geo_data.getElementsByTagName('geo:long')[0].childNodes[0].data
+            v_details = event.getElementsByTagName('venue')[0]
+            venue_name = v_details.getElementsByTagName('name')[0]\
+                    .childNodes[0].data
+            address = get_address(v_details.getElementsByTagName('location')[0])
+            geo_data = v_details.getElementsByTagName('geo:point')[0]
+            venue_lat = geo_data.getElementsByTagName('geo:lat')[0]\
+                    .childNodes[0].data
+            venue_long = geo_data.getElementsByTagName('geo:long')[0]\
+                    .childNodes[0].data
             distance = location.distance_between(float(lat), 
-                                                 float(long), 
+                                                 float(lng), 
                                                  float(venue_lat), 
                                                  float(venue_long))
             
@@ -45,20 +49,24 @@ def parse_xml(xml, lat, long):
                                 'date': start_date})
     return events_list
 
-def get_address(location):
+def get_address(location_element):
     """ Return the venues address details from the xml element """
     street = ''
     city = ''
     country = ''
     postalcode = ''
-    if location.getElementsByTagName('street')[0].childNodes:
-        street = location.getElementsByTagName('street')[0].childNodes[0].data
-    if location.getElementsByTagName('city')[0].childNodes:
-        city = location.getElementsByTagName('city')[0].childNodes[0].data
-    if location.getElementsByTagName('country')[0].childNodes:
-        country = location.getElementsByTagName('country')[0].childNodes[0].data
-    if location.getElementsByTagName('postalcode')[0].childNodes:
-        postalcode = location.getElementsByTagName('postalcode')[0].childNodes[0].data
+    if location_element.getElementsByTagName('street')[0].childNodes:
+        street = location_element.getElementsByTagName('street')[0]\
+                .childNodes[0].data
+    if location_element.getElementsByTagName('city')[0].childNodes:
+        city = location_element.getElementsByTagName('city')[0]\
+                .childNodes[0].data
+    if location_element.getElementsByTagName('country')[0].childNodes:
+        country = location_element.getElementsByTagName('country')[0]\
+                .childNodes[0].data
+    if location_element.getElementsByTagName('postalcode')[0].childNodes:
+        postalcode = location_element.getElementsByTagName('postalcode')[0]\
+                .childNodes[0].data
     return '\n'.join([street, city, country, postalcode])
 
 def parse_date(date_string):