diff --git a/scrapers/wv/__init__.py b/scrapers/wv/__init__.py index d4d85d1052..5930d5c1b9 100644 --- a/scrapers/wv/__init__.py +++ b/scrapers/wv/__init__.py @@ -245,6 +245,6 @@ def get_session_list(self): from utils import url_xpath return url_xpath( - "http://www.legis.state.wv.us/Bill_Status/Bill_Status.cfm", + "https://www.wvlegislature.gov/Bill_Status/Bill_Status.cfm", '//select[@name="year"]/option/text()', ) diff --git a/scrapers/wv/bills.py b/scrapers/wv/bills.py index bfb1b1cb6a..06fea6d3de 100644 --- a/scrapers/wv/bills.py +++ b/scrapers/wv/bills.py @@ -75,7 +75,7 @@ def scrape_chamber(self, chamber, session): # scrape bills if "special" in self.jurisdiction.legislative_sessions[-1]["name"].lower(): url = ( - "http://www.legis.state.wv.us/Bill_Status/Bills_all_bills.cfm?" + "https://www.wvlegislature.gov/Bill_Status/Bills_all_bills.cfm?" "year=%s&sessiontype=%s&btype=bill&orig=%s" % ( self.jurisdiction.legislative_sessions[-1]["_scraped_name"], @@ -85,7 +85,7 @@ def scrape_chamber(self, chamber, session): ) else: url = ( - "http://www.legis.state.wv.us/Bill_Status/Bills_all_bills.cfm?" + "https://www.wvlegislature.gov/Bill_Status/Bills_all_bills.cfm?" "year=%s&sessiontype=RS&btype=bill&orig=%s" % (session, orig) ) @@ -98,7 +98,7 @@ def scrape_chamber(self, chamber, session): # "upper", # "SB 500", # "test", - # "http://www.legis.state.wv.us/Bill_Status/Bills_history.cfm?input=500&year=2020&sessiontype=RS&btype=bill", + # "https://www.wvlegislature.gov/Bill_Status/Bills_history.cfm?input=500&year=2020&sessiontype=RS&btype=bill", # ) for link in page.xpath("//a[contains(@href, 'Bills_history')]"): @@ -114,7 +114,7 @@ def scrape_chamber(self, chamber, session): # scrape resolutions if "special" in self.jurisdiction.legislative_sessions[-1]["name"].lower(): res_url = ( - "http://www.legis.state.wv.us/Bill_Status/res_list.cfm?year=%s" + "https://www.wvlegislature.gov/Bill_Status/res_list.cfm?year=%s" "&sessiontype=%s&btype=res" % ( self.jurisdiction.legislative_sessions[-1]["_scraped_name"], @@ -123,7 +123,7 @@ def scrape_chamber(self, chamber, session): ) else: res_url = ( - "http://www.legis.state.wv.us/Bill_Status/res_list.cfm?year=%s" + "https://www.wvlegislature.gov/Bill_Status/res_list.cfm?year=%s" "&sessiontype=rs&btype=res" % (self.jurisdiction.legislative_sessions[-1]["_scraped_name"]) ) @@ -426,7 +426,7 @@ def scrape_senate_vote(self, bill, url, date): def scrape_senate_vote_3col(self, bill, vote, text, url, date): """Scrape senate votes like this one: - http://www.legis.state.wv.us/legisdocs/2013/RS/votes/senate/02-26-0001.pdf + https://www.wvlegislature.gov/legisdocs/2013/RS/votes/senate/02-26-0001.pdf """ counts = dict(re.findall(r"(Yea|Nay|Absent): (\d+)", text)) lines = filter(None, text.splitlines())