Merge branch 'master' of github.com:openstates/openstates

openstates · Jun 16, 2017 · a4fcc5a · a4fcc5a
2 parents 87cec9f + 3afec97
commit a4fcc5a
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/openstates/ca/actions.py b/openstates/ca/actions.py
@@ -27,7 +27,7 @@
 
     Rule(r'Approved by the Governor', 'executive-signature'),
     Rule(r'Approved by the Governor with item veto',
-         'executive-veto:line-item'),
+         'executive-veto-line-item'),
     Rule('Vetoed by Governor', 'executive-veto'),
     Rule('Vetoed by the Governor', 'executive-veto'),
     Rule(r'To Governor', 'executive-receipt'),

diff --git a/openstates/co/actions.py b/openstates/co/actions.py
@@ -56,7 +56,7 @@
     Rule('^Introduced in House', actor='lower'),
     Rule('^Governor', actor='executive'),
 
-    Rule('Governor Action - Partial Veto', 'executive-veto:line-item'),
+    Rule('Governor Action - Partial Veto', 'executive-veto-line-item'),
     Rule('Sent to the Governor', 'executive-receipt'),
     Rule('Governor Action - Signed', 'executive-signature'),
     Rule('Governor Signed', 'executive-signature'),

diff --git a/openstates/ks/ksapi.py b/openstates/ks/ksapi.py
@@ -12,7 +12,7 @@
     'gov_avm_336': 'veto-override-passage',
     # change sequence
     'mot_cgo_200': None, 'mot_cgo_201': None, 'mot_cgo_202': None,
-    'gov_mg_378': 'executive-veto:line-item',
+    'gov_mg_378': 'executive-veto-line-item',
     'fa_fabc_115': 'failure',
     'cr_rsc_292': 'committee-passage-favorable',
     'cr_rsc_276': 'committee-passage',

diff --git a/openstates/mt/actions.py b/openstates/mt/actions.py
@@ -132,7 +132,7 @@
         },
 
     # The governor has issued a line-item (partial) veto
-    "executive-veto:line-item": {
+    "executive-veto-line-item": {
         'rgxs': [
             u"Returned with Governor's Line-item Veto",
             ],

diff --git a/openstates/sc/bills.py b/openstates/sc/bills.py
@@ -22,7 +22,7 @@ def action_type(action):
                    ('Amended and adopted',
                     ['passage', 'amendment-passage']),
                    ('Amended', 'amendment-passage'),
-                   ('Certain items vetoed', 'executive-veto:line-item'),
+                   ('Certain items vetoed', 'executive-veto-line-item'),
                    ('Committed to', 'referral-committee'),
                    ('Committee Amendment Adopted', 'amendment-passage'),
                    ('Committee Amendment Amended and Adopted',

diff --git a/openstates/tn/bills.py b/openstates/tn/bills.py
@@ -122,7 +122,7 @@ def __new__(_cls, regex, types=None, stop=True, **kwargs):
     Rule('Second reading, passed', ['passage', 'reading-2']),
     Rule('Transmitted to Gov. for action.', 'executive-receipt'),
     Rule('Transmitted to Governor for his action.', 'executive-receipt'),
-    Rule('Signed by Governor, but item veto', 'executive-veto:line-item'),
+    Rule('Signed by Governor, but item veto', 'executive-veto-line-item'),
     Rule('Signed by Governor', 'executive-signature'),
     Rule('Withdrawn', 'withdrawal'),
     Rule('tabled', 'amendment-deferral'),