Adjust scraper to new table design.

scraper.py

@@ -3,26 +3,28 @@
 import lxml.html
 import scraperwiki
 
-html = requests.get('http://www.premierleague.com/en-gb/matchday/league-table.html').content
+html = requests.get('http://www.premierleague.com/tables').content
 
 dom = lxml.html.fromstring(html)
 
 premierLeagueData = []
 
-for row in dom.cssselect('tr.club-row'):
-    pos = int(row.cssselect('.col-pos')[0].text_content())
-    team = row.cssselect('.col-club')[0].text_content()
-    goalsFor = int(row.cssselect('.col-gf')[0].text_content())
-    goalsAgainst = int(row.cssselect('.col-ga')[0].text_content())
-    goalDifference = int(row.cssselect('.col-gd')[0].text_content())
-    points = int(row.cssselect('.col-pts')[0].text_content())
+for row in dom.cssselect('.mainTableTab table .tableBodyContainer > tr:not(.expandable)'):
+    pos = int(row.cssselect('.pos .value')[0].text_content())
+    team = row.cssselect('.team .long')[0].text_content()
+    goalsFor = int(row.cssselect('td')[7].text_content())
+    goalsAgainst = int(row.cssselect('td')[8].text_content())
+    goalDifference = int(row.cssselect('td')[9].text_content())
+    points = int(row.cssselect('.points')[0].text_content())
     #print pos, team,"gf", goalsFor, "ga", goalsAgainst, "gd", goalDifference, "pts", points
-    teamItem = {'pos':pos,
+    teamItem = {
+        'pos':pos,
         'team':team,
         'gf':goalsFor,
         'ga':goalsAgainst,
         'gd':goalDifference,
-        'pts':points}
+        'pts':points
+    }
     premierLeagueData.append(teamItem)
 
 if len(premierLeagueData) > 0:
@@ -31,6 +33,5 @@
     #add each table line to data store
     for teamItem in premierLeagueData:
         scraperwiki.sql.save(['team'], teamItem)
-
-
-
+else:
+    raise ValueError('Cannot read table, maybe format or URL has changed.')