Permalink
Browse files

make states rely on billy.scrape

  • Loading branch information...
1 parent 3cc5977 commit b100eb88f85c37e6834026cbaf2cbd84c3a4d23f @jamesturk jamesturk committed Jan 13, 2011
Showing with 266 additions and 266 deletions.
  1. 0 openstates/__init__.py
  2. +3 −3 openstates/ak/bills.py
  3. +2 −2 openstates/ak/legislators.py
  4. +1 −1 openstates/al/bills.py
  5. +1 −1 openstates/al/legislators.py
  6. +5 −5 openstates/az/bills.py
  7. +3 −3 openstates/az/committees.py
  8. +2 −2 openstates/az/events.py
  9. +2 −2 openstates/az/legislators.py
  10. +6 −6 openstates/ca/bills.py
  11. +2 −2 openstates/ca/committees.py
  12. +2 −2 openstates/ca/download.py
  13. +5 −5 openstates/ca/legislators.py
  14. +4 −4 openstates/co/bills.py
  15. +3 −3 openstates/co/legislators.py
  16. +2 −2 openstates/ct/bills.py
  17. +2 −2 openstates/dc/bills.py
  18. +1 −1 openstates/dc/legislators.py
  19. +3 −3 openstates/ex/bills.py
  20. +1 −1 openstates/ex/committees.py
  21. +2 −2 openstates/ex/legislators.py
  22. +3 −3 openstates/fl/bills.py
  23. +2 −2 openstates/fl/legislators.py
  24. +1 −1 openstates/ga/bills.py
  25. +4 −4 openstates/hi/bills.py
  26. +3 −3 openstates/hi/legislators.py
  27. +3 −3 openstates/il/bills.py
  28. +2 −2 openstates/il/legislators.py
  29. +1 −1 openstates/il/votes.py
  30. +1 −1 openstates/in/bills.py
  31. +2 −2 openstates/in/committees.py
  32. +2 −2 openstates/in/legislators.py
  33. +3 −3 openstates/ky/bills.py
  34. +2 −2 openstates/ky/legislators.py
  35. +5 −5 openstates/la/bills.py
  36. +2 −2 openstates/la/committees.py
  37. +2 −2 openstates/la/events.py
  38. +2 −2 openstates/la/legislators.py
  39. +4 −4 openstates/md/bills.py
  40. +1 −1 openstates/md/committees.py
  41. +2 −2 openstates/md/legislators.py
  42. +4 −4 openstates/me/bills.py
  43. +3 −3 openstates/me/committees.py
  44. +3 −3 openstates/me/legislators.py
  45. +3 −3 openstates/mi/bills.py
  46. +1 −1 openstates/mi/legislators.py
  47. +2 −2 openstates/mn/bills.py
  48. +2 −2 openstates/mn/committees.py
  49. +2 −2 openstates/mn/legislators.py
  50. +2 −2 openstates/mn/votes.py
  51. +2 −2 openstates/mo/bills.py
  52. +5 −5 openstates/ms/bills.py
  53. +3 −3 openstates/ms/committees.py
  54. +3 −3 openstates/ms/legislators.py
  55. +4 −4 openstates/mt/bills.py
  56. +2 −2 openstates/mt/legislators.py
  57. +1 −1 openstates/nc/bills.py
  58. +1 −1 openstates/nc/committees.py
  59. +1 −1 openstates/nc/legislators.py
  60. +1 −1 openstates/nc/votes.py
  61. +3 −3 openstates/nd/bills.py
  62. +3 −3 openstates/nd/legislators.py
  63. +2 −2 openstates/nh/bills.py
  64. +4 −4 openstates/nj/bills.py
  65. +3 −3 openstates/nj/committees.py
  66. +3 −3 openstates/nj/legislators.py
  67. +4 −4 openstates/nm/bills.py
  68. +3 −3 openstates/nm/legislators.py
  69. +4 −4 openstates/nv/bills.py
  70. +3 −3 openstates/nv/committees.py
  71. +3 −3 openstates/nv/legislators.py
  72. +4 −4 openstates/ny/committees.py
  73. +3 −3 openstates/ny/legislators.py
  74. +3 −3 openstates/oh/bills.py
  75. +2 −2 openstates/oh/committees.py
  76. +2 −2 openstates/oh/legislators.py
  77. +4 −4 openstates/ore/bills.py
  78. +3 −3 openstates/ore/legislators.py
  79. +5 −5 openstates/pa/bills.py
  80. +2 −2 openstates/pa/committees.py
  81. +4 −4 openstates/pa/legislators.py
  82. +4 −4 openstates/pr/bills.py
  83. +3 −3 openstates/pr/committees.py
  84. +3 −3 openstates/pr/legislators.py
  85. +3 −3 openstates/sd/bills.py
  86. +3 −3 openstates/sd/legislators.py
  87. +4 −4 openstates/tx/bills.py
  88. +2 −2 openstates/tx/events.py
  89. +3 −3 openstates/tx/legislators.py
  90. +2 −2 openstates/tx/votes.py
  91. +4 −4 openstates/ut/bills.py
  92. +2 −2 openstates/ut/committees.py
  93. +2 −2 openstates/ut/legislators.py
  94. +2 −2 openstates/va/bills.py
  95. +1 −1 openstates/va/legislators.py
  96. +3 −3 openstates/vt/bills.py
  97. +2 −2 openstates/vt/legislators.py
  98. +4 −4 openstates/wa/bills.py
  99. +3 −3 openstates/wa/legislators.py
  100. +3 −3 openstates/wi/bills.py
  101. +1 −1 openstates/wi/legislators.py
  102. +1 −1 openstates/wv/bills.py
View
0 openstates/__init__.py
No changes.
View
6 openstates/ak/bills.py
@@ -1,9 +1,9 @@
import re
import datetime as dt
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import html5lib
View
4 openstates/ak/legislators.py
@@ -1,8 +1,8 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
2 openstates/al/bills.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape.bills import BillScraper, Bill
import re
import datetime
View
2 openstates/al/legislators.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
10 openstates/az/bills.py
@@ -1,10 +1,10 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.az import utils
-from fiftystates.scrape.az.action_utils import get_action_type
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.az import utils
+from openstates.az.action_utils import get_action_type
from lxml import html
View
6 openstates/az/committees.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
from lxml import etree, html
-from fiftystates.scrape.az import utils
+from openstates.az import utils
from scrapelib import HTTPError
import re, datetime
View
4 openstates/az/events.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.events import EventScraper, Event
+from billy.scrape import NoDataForPeriod
+from billy.scrape.events import EventScraper, Event
from lxml import html
import datetime, re
View
4 openstates/az/legislators.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
from lxml import html
import re, datetime
View
12 openstates/ca/bills.py
@@ -2,12 +2,12 @@
import os
import datetime
-from fiftystates import settings
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.ca import metadata
-from fiftystates.scrape.ca.models import CABill, CABillVersion
+from billy import settings
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.ca import metadata
+from openstates.ca.models import CABill, CABillVersion
from sqlalchemy.orm import sessionmaker, relation, backref
from sqlalchemy import create_engine
View
4 openstates/ca/committees.py
@@ -1,8 +1,8 @@
import re
import urllib2
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
4 openstates/ca/download.py
@@ -6,8 +6,8 @@
import tempfile
import scrapelib
-from fiftystates import settings
-from fiftystates.backend import db
+from billy import settings
+from billy.backend import db
def get_latest():
"""
View
10 openstates/ca/legislators.py
@@ -1,10 +1,10 @@
import os
-from fiftystates import settings
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.ca import metadata
-from fiftystates.scrape.ca.models import CALegislator
+from billy import settings
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.ca import metadata
+from openstates.ca.models import CALegislator
from sqlalchemy.orm import sessionmaker, relation, backref
from sqlalchemy import create_engine
View
8 openstates/co/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.co.utils import year_from_session, BASE_URL
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from openstates.co.utils import year_from_session, BASE_URL
import lxml.html
import re
View
6 openstates/co/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.co.utils import BASE_URL, year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.co.utils import BASE_URL, year_from_session
import lxml.html
import re, contextlib
View
4 openstates/ct/bills.py
@@ -3,8 +3,8 @@
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape.bills import Bill, BillScraper
-from fiftystates.scrape.votes import Vote
+from billy.scrape.bills import Bill, BillScraper
+from billy.scrape.votes import Vote
class CTBillScraper(BillScraper):
#some constants
View
4 openstates/dc/bills.py
@@ -2,8 +2,8 @@
import datetime
import lxml.html
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
def extract_int(text):
return int(text.replace(u'\xc2', '').strip())
View
2 openstates/dc/legislators.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
def get_surrounding_block(doc, key):
View
6 openstates/ex/bills.py
@@ -1,8 +1,8 @@
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
class EXBillScraper(BillScraper):
View
2 openstates/ex/committees.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape.committees import CommitteeScraper, Committee
class EXCommitteeScraper(CommitteeScraper):
View
4 openstates/ex/legislators.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
class EXLegislatorScraper(LegislatorScraper):
View
6 openstates/fl/bills.py
@@ -1,9 +1,9 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import lxml.html
View
4 openstates/fl/legislators.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
2 openstates/ga/bills.py
@@ -4,7 +4,7 @@
import contextlib
import datetime
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape.bills import BillScraper, Bill
class GABillScraper(BillScraper):
"""
View
8 openstates/hi/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.hi.utils import BASE_URL, year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from openstates.hi.utils import BASE_URL, year_from_session
import lxml.html
import re
View
6 openstates/hi/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.hi.utils import year_from_session, BASE_URL
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.hi.utils import year_from_session, BASE_URL
import lxml.html
View
6 openstates/il/bills.py
@@ -5,9 +5,9 @@
from util import get_soup, get_text, elem_name, standardize_chamber
import votes
-from fiftystates.scrape.il import year2session
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from openstates.il import year2session
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
BASE_LEGISLATION_URL = "http://ilga.gov/legislation/default.asp?GA=%s"
View
4 openstates/il/legislators.py
@@ -4,8 +4,8 @@
import re
from util import get_text
-from fiftystates.scrape.il import year2session
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from openstates.il import year2session
+from billy.scrape.legislators import LegislatorScraper, Legislator
MEMBER_LIST_URL = {
'upper': 'http://ilga.gov/senate/default.asp?GA=%s',
View
2 openstates/il/votes.py
@@ -14,7 +14,7 @@
import csv
from util import get_soup
-from fiftystates.scrape.votes import Vote
+from billy.scrape.votes import Vote
EXPECTED_VOTE_CODES = ['Y','N','E','NV','A','P','-']
DOCUMENT_TYPES = ['EO', 'HB', 'HJR', 'HJRCA', 'HR', 'JSR', 'SB', 'SJR', 'SJRCA', 'SR']
View
2 openstates/in/bills.py
@@ -1,7 +1,7 @@
import datetime
from collections import defaultdict
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape.bills import BillScraper, Bill
import lxml.html
View
4 openstates/in/committees.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
4 openstates/in/legislators.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
6 openstates/ky/bills.py
@@ -4,9 +4,9 @@
from BeautifulSoup import BeautifulSoup
import html5lib
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.ky import metadata
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from openstates.ky import metadata
def chamber_abbr(chamber):
if chamber == 'upper':
View
4 openstates/ky/legislators.py
@@ -1,8 +1,8 @@
import re
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import Legislator, LegislatorScraper
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import Legislator, LegislatorScraper
def split_name(full_name):
last_name = full_name.split(',')[0]
View
10 openstates/la/bills.py
@@ -3,11 +3,11 @@
import tempfile
import datetime
-from fiftystates.scrape import ScrapeError
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.utils import pdf_to_lxml
-from fiftystates.scrape.la import metadata
+from billy.scrape import ScrapeError
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from billy.scrape.utils import pdf_to_lxml
+from openstates.la import metadata
import lxml.html
View
4 openstates/la/committees.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
4 openstates/la/events.py
@@ -1,8 +1,8 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.events import EventScraper, Event
+from billy.scrape import NoDataForPeriod
+from billy.scrape.events import EventScraper, Event
import lxml.html
View
4 openstates/la/legislators.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
8 openstates/md/bills.py
@@ -6,10 +6,10 @@
import lxml.html
from scrapelib import HTTPError
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.md import metadata
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.md import metadata
CHAMBERS = {
'upper': ('SB','SJ'),
View
2 openstates/md/committees.py
@@ -1,6 +1,6 @@
import lxml.html
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape.committees import CommitteeScraper, Committee
class MDCommitteeScraper(CommitteeScraper):
View
4 openstates/md/legislators.py
@@ -2,8 +2,8 @@
import lxml.html
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
PARTY_DICT = {'D': 'Democratic', 'R': 'Republican', 'I': 'Independent'}
View
8 openstates/me/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape.me import metadata
-from fiftystates.scrape.me.utils import chamber_name
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import VoteScraper, Vote
+from openstates.me import metadata
+from openstates.me.utils import chamber_name
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import VoteScraper, Vote
from datetime import datetime
import lxml.etree
View
6 openstates/me/committees.py
@@ -2,9 +2,9 @@
import urlparse
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
-from fiftystates.scrape.oh.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
+from openstates.oh.utils import clean_committee_name
import lxml.etree
import xlrd
View
6 openstates/me/legislators.py
@@ -2,9 +2,9 @@
import urlparse
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.me.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.me.utils import clean_committee_name
import lxml.etree
import xlrd
View
6 openstates/mi/bills.py
@@ -1,9 +1,9 @@
import datetime as dt
import re
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod
from BeautifulSoup import BeautifulSoup
View
2 openstates/mi/legislators.py
@@ -1,6 +1,6 @@
import re
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
from BeautifulSoup import BeautifulSoup
View
4 openstates/mn/bills.py
@@ -3,8 +3,8 @@
import urlparse
import lxml.html
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
# Base URL for the details of a given bill.
BILL_DETAIL_URL_BASE = 'https://www.revisor.mn.gov/revisor/pages/search_status/'
View
4 openstates/mn/committees.py
@@ -1,8 +1,8 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import Committee, CommitteeScraper
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import Committee, CommitteeScraper
import lxml.html
def fix_whitespace(s):
View
4 openstates/mn/legislators.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape.legislators import Legislator, LegislatorScraper
-from fiftystates.scrape import NoDataForPeriod
+from billy.scrape.legislators import Legislator, LegislatorScraper
+from billy.scrape import NoDataForPeriod
import lxml.html
View
4 openstates/mn/votes.py
@@ -2,8 +2,8 @@
import datetime
import itertools
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.votes import VoteScraper, Vote
+from billy.scrape import NoDataForPeriod
+from billy.scrape.votes import VoteScraper, Vote
import lxml.html
class MNVoteScraper(VoteScraper):
View
4 openstates/mo/bills.py
@@ -4,8 +4,8 @@
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
from utils import (clean_text, house_get_actor_from_action,
senate_get_actor_from_action)
View
10 openstates/ms/bills.py
@@ -1,8 +1,8 @@
-from fiftystates.scrape.ms import metadata
-from fiftystates.scrape.ms.utils import chamber_name, parse_ftp_listing
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import VoteScraper, Vote
-from fiftystates.scrape.utils import convert_pdf
+from openstates.ms import metadata
+from openstates.ms.utils import chamber_name, parse_ftp_listing
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import VoteScraper, Vote
+from billy.scrape.utils import convert_pdf
from datetime import datetime
import lxml.etree
import re
View
6 openstates/ms/committees.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
-from fiftystates.scrape.ms.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
+from openstates.ms.utils import clean_committee_name
import lxml.etree
View
6 openstates/ms/legislators.py
@@ -1,9 +1,9 @@
import urlparse
import lxml.etree
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.ms.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.ms.utils import clean_committee_name
import scrapelib
View
8 openstates/mt/bills.py
@@ -2,10 +2,10 @@
import re
from datetime import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.mt import metadata
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.mt import metadata
import html5lib
import lxml.html
View
4 openstates/mt/legislators.py
@@ -1,8 +1,8 @@
import os
import csv
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import html5lib
import lxml.html
View
2 openstates/nc/bills.py
@@ -4,7 +4,7 @@
import lxml.html
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape.bills import BillScraper, Bill
class NCBillScraper(BillScraper):
View
2 openstates/nc/committees.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
2 openstates/nc/legislators.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
2 openstates/nc/votes.py
@@ -1,7 +1,7 @@
from zipfile import ZipFile
import datetime
-from fiftystates.scrape.votes import VoteScraper, Vote
+from billy.scrape.votes import VoteScraper, Vote
class NCVoteScraper(VoteScraper):
state = 'nc'
View
6 openstates/nd/bills.py
@@ -2,9 +2,9 @@
import html5lib
import re
-from fiftystates.scrape import NoDataForPeriod, ScrapeError
-from fiftystates.scrape.bills import Bill, BillScraper
-from fiftystates.scrape.nd import metadata
+from billy.scrape import NoDataForPeriod, ScrapeError
+from billy.scrape.bills import Bill, BillScraper
+from openstates.nd import metadata
class NDBillScraper(BillScraper):
"""
View
6 openstates/nd/legislators.py
@@ -2,9 +2,9 @@
import re
import html5lib
-from fiftystates.scrape import NoDataForPeriod, ScrapeError
-from fiftystates.scrape.legislators import Legislator, LegislatorScraper
-from fiftystates.scrape.nd import metadata
+from billy.scrape import NoDataForPeriod, ScrapeError
+from billy.scrape.legislators import Legislator, LegislatorScraper
+from openstates.nd import metadata
class NDLegislatorScraper(LegislatorScraper):
"""
View
4 openstates/nh/bills.py
@@ -3,8 +3,8 @@
import re
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import Bill, BillScraper
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import Bill, BillScraper
class NHBillScraper(BillScraper):
View
8 openstates/nj/bills.py
@@ -1,8 +1,8 @@
from datetime import datetime
-from fiftystates.scrape.nj import metadata
-from fiftystates.scrape.nj.utils import chamber_name, DBFMixin
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import VoteScraper, Vote
+from openstates.nj import metadata
+from openstates.nj.utils import chamber_name, DBFMixin
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import VoteScraper, Vote
import lxml.etree
import scrapelib
View
6 openstates/nj/committees.py
@@ -1,8 +1,8 @@
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
-from fiftystates.scrape.nv.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
+from openstates.nv.utils import clean_committee_name
import lxml.etree
from dbfpy import dbf
View
6 openstates/nj/legislators.py
@@ -2,9 +2,9 @@
import urlparse
import htmlentitydefs
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.nj.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.nj.utils import clean_committee_name
import scrapelib
from dbfpy import dbf
View
8 openstates/nm/bills.py
@@ -3,10 +3,10 @@
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.nm import metadata
-from fiftystates.scrape.nm.utils import get_abs_url
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from openstates.nm import metadata
+from openstates.nm.utils import get_abs_url
DATE_RE = re.compile(r'\((?P<date>.*)\)')
View
6 openstates/nm/legislators.py
@@ -2,9 +2,9 @@
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.nm.utils import get_abs_url
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.nm.utils import get_abs_url
class NMLegislatorScraper(LegislatorScraper):
View
8 openstates/nv/bills.py
@@ -1,10 +1,10 @@
import re
from datetime import datetime
-from fiftystates.scrape.nv import metadata
-from fiftystates.scrape.nv.utils import chamber_name, parse_ftp_listing
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import VoteScraper, Vote
+from openstates.nv import metadata
+from openstates.nv.utils import chamber_name, parse_ftp_listing
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import VoteScraper, Vote
import lxml.html
View
6 openstates/nv/committees.py
@@ -1,9 +1,9 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
-from fiftystates.scrape.nv.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
+from openstates.nv.utils import clean_committee_name
import lxml.etree
View
6 openstates/nv/legislators.py
@@ -2,9 +2,9 @@
import urlparse
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.nv.utils import clean_committee_name
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.nv.utils import clean_committee_name
import lxml.etree
import urllib
View
8 openstates/ny/committees.py
@@ -1,10 +1,10 @@
import lxml.html
import datetime as dt
-from fiftystates.scrape import NoDataForPeriod
+from billy.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape.committees import CommitteeScraper, Committee
-import nyss_openlegislation.models
+import nyss_billyslation.models
class NYCommitteeScraper(CommitteeScraper):
@@ -55,7 +55,7 @@ def scrape_assembly(self):
def scrape_senate(self):
"""Scrape Senate Committees"""
- for name, comm in nyss_openlegislation.models.committees.items():
+ for name, comm in nyss_billyslation.models.committees.items():
name = name.title().replace('And', 'and')
committee = Committee('upper', name)
View
6 openstates/ny/legislators.py
@@ -1,10 +1,10 @@
#!/usr/bin/env python
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
from votesmart import votesmart, VotesmartApiError
-from fiftystates import settings
+from billy import settings
import os
-from nyss_openlegislation.models import senators
+from nyss_billyslation.models import senators
votesmart.apikey = os.environ.get('VOTESMART_API_KEY', settings.VOTESMART_API_KEY)
View
6 openstates/oh/bills.py
@@ -3,9 +3,9 @@
import urlparse
import datetime
-from fiftystates.scrape import ScrapeError
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import ScrapeError
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import xlrd
import scrapelib
View
4 openstates/oh/committees.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.etree
View
4 openstates/oh/legislators.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.etree
View
8 openstates/ore/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.ore.utils import bills_url, base_url, year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from openstates.ore.utils import bills_url, base_url, year_from_session
import lxml.html
import re
View
6 openstates/ore/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.ore.utils import year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.ore.utils import year_from_session
import lxml.html
View
10 openstates/pa/bills.py
@@ -1,11 +1,11 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.pa import metadata
-from fiftystates.scrape.pa.utils import (bill_abbr, start_year,
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.pa import metadata
+from openstates.pa.utils import (bill_abbr, start_year,
parse_action_date,
bill_list_url, history_url, info_url,
vote_url)
View
4 openstates/pa/committees.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
8 openstates/pa/legislators.py
@@ -1,9 +1,9 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.pa import metadata
-from fiftystates.scrape.pa.utils import legislators_url
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.pa import metadata
+from openstates.pa.utils import legislators_url
import lxml.html
View
8 openstates/pr/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.pr.utils import grouper, doc_link_url, year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from openstates.pr.utils import grouper, doc_link_url, year_from_session
import lxml.html
import datetime as dt
View
6 openstates/pr/committees.py
@@ -1,8 +1,8 @@
import lxml.html
import contextlib
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
-from fiftystates.scrape.pr.utils import committees_url, grouper,\
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
+from openstates.pr.utils import committees_url, grouper,\
clean_newline, clean_space, between_keywords
View
6 openstates/pr/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.pr.utils import legislators_url, year_from_session
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.pr.utils import legislators_url, year_from_session
import lxml.html
import re
View
6 openstates/sd/bills.py
@@ -1,9 +1,9 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod, ScrapeError
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod, ScrapeError
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import lxml.html
View
6 openstates/sd/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.sd import metadata
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.sd import metadata
import lxml.html
View
8 openstates/tx/bills.py
@@ -2,10 +2,10 @@
import urlparse
import datetime as dt
-from fiftystates.scrape import ScrapeError
-from fiftystates.scrape.tx import metadata
-from fiftystates.scrape.tx.utils import chamber_name, parse_ftp_listing
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape import ScrapeError
+from openstates.tx import metadata
+from openstates.tx.utils import chamber_name, parse_ftp_listing
+from billy.scrape.bills import BillScraper, Bill
import lxml.etree
import urllib2
View
4 openstates/tx/events.py
@@ -1,8 +1,8 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.events import EventScraper, Event
+from billy.scrape import NoDataForPeriod
+from billy.scrape.events import EventScraper, Event
import pytz
import feedparser
View
6 openstates/tx/legislators.py
@@ -1,9 +1,9 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import (LegislatorScraper, Legislator,
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import (LegislatorScraper, Legislator,
Person)
-from fiftystates.scrape.tx.utils import clean_committee_name
+from openstates.tx.utils import clean_committee_name
import lxml.html
View
4 openstates/tx/votes.py
@@ -3,8 +3,8 @@
import urlparse
import datetime
-from fiftystates.scrape.votes import VoteScraper, Vote
-from fiftystates.scrape.tx.utils import parse_ftp_listing
+from billy.scrape.votes import VoteScraper, Vote
+from openstates.tx.utils import parse_ftp_listing
import lxml.etree
View
8 openstates/ut/bills.py
@@ -1,10 +1,10 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.ut import metadata
+from billy.scrape import NoDataForPeriod
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
+from openstates.ut import metadata
import lxml.html
View
4 openstates/ut/committees.py
@@ -1,7 +1,7 @@
import re
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.committees import CommitteeScraper, Committee
+from billy.scrape import NoDataForPeriod
+from billy.scrape.committees import CommitteeScraper, Committee
import lxml.html
View
4 openstates/ut/legislators.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.ut import metadata
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.ut import metadata
import lxml.html
View
4 openstates/va/bills.py
@@ -2,8 +2,8 @@
import datetime
from collections import defaultdict
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import lxml.html
BASE_URL = 'http://leg6.state.va.us'
View
2 openstates/va/legislators.py
@@ -1,4 +1,4 @@
-from fiftystates.scrape.legislators import Legislator, LegislatorScraper
+from billy.scrape.legislators import Legislator, LegislatorScraper
import re
import lxml.html
View
6 openstates/vt/bills.py
@@ -1,9 +1,9 @@
import re
import datetime
-from fiftystates.scrape import NoDataForPeriod, ScrapeError
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape import NoDataForPeriod, ScrapeError
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
import lxml.html
View
4 openstates/vt/legislators.py
@@ -1,5 +1,5 @@
-from fiftystates.scrape import NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape import NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
import lxml.html
View
8 openstates/wa/bills.py
@@ -1,7 +1,7 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.votes import Vote
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.wa.utils import year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.votes import Vote
+from billy.scrape.bills import BillScraper, Bill
+from openstates.wa.utils import year_from_session
import lxml.html
import re
View
6 openstates/wa/legislators.py
@@ -1,6 +1,6 @@
-from fiftystates.scrape import ScrapeError, NoDataForPeriod
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
-from fiftystates.scrape.wa.utils import year_from_session
+from billy.scrape import ScrapeError, NoDataForPeriod
+from billy.scrape.legislators import LegislatorScraper, Legislator
+from openstates.wa.utils import year_from_session
import lxml.html
import re
View
6 openstates/wi/bills.py
@@ -6,9 +6,9 @@
import scrapelib
-from fiftystates.scrape.utils import convert_pdf
-from fiftystates.scrape.bills import BillScraper, Bill
-from fiftystates.scrape.votes import Vote
+from billy.scrape.utils import convert_pdf
+from billy.scrape.bills import BillScraper, Bill
+from billy.scrape.votes import Vote
motion_classifiers = {
'(Assembly|Senate)( substitute)? amendment': 'amendment',
View
2 openstates/wi/legislators.py
@@ -2,7 +2,7 @@
import lxml.html
import re
-from fiftystates.scrape.legislators import LegislatorScraper, Legislator
+from billy.scrape.legislators import LegislatorScraper, Legislator
PARTY_DICT = {'D': 'Democratic', 'R': 'Republican', 'I': 'Independent'}
View
2 openstates/wv/bills.py
@@ -5,7 +5,7 @@
import urllib2
from BeautifulSoup import BeautifulSoup
-from fiftystates.scrape.bills import BillScraper, Bill
+from billy.scrape.bills import BillScraper, Bill
def cleansource(data):
'''Remove some irregularities from WV's HTML.

0 comments on commit b100eb8

Please sign in to comment.