diff --git a/bin/update_dossiers b/bin/update_dossiers index f0dcdf4cd9ab92b57b063768ca60721b548ef199..caf7824013e289dae08054c19900ac12f632c919 100755 --- a/bin/update_dossiers +++ b/bin/update_dossiers @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -x source bin/lib.sh diff --git a/bin/update_proposals b/bin/update_proposals index 8e21c67a23da9cdaf7b86797b9573077b3eccd9c..50c1768acbc3fa29acada4dad03b08398864f023 100755 --- a/bin/update_proposals +++ b/bin/update_proposals @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -x source bin/lib.sh diff --git a/bin/update_representatives b/bin/update_representatives index 8872dc9812ff042068a9ada241d5604d27a1dcf7..5955f3f510cba33c735d9680b2be405553313bae 100755 --- a/bin/update_representatives +++ b/bin/update_representatives @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -x source bin/lib.sh diff --git a/bin/update_votes b/bin/update_votes index 1f5b62374e56fd0995273bd8bb4868f856b7cab6..a1999a32496e02f0e021b22f60fd6288e26cfaa6 100755 --- a/bin/update_votes +++ b/bin/update_votes @@ -1,5 +1,5 @@ #!/bin/bash -set -ex +set -x source bin/lib.sh diff --git a/src/representatives/contrib/francedata/variants.py b/src/representatives/contrib/francedata/variants.py index 49f0deb4e07222082f0c4835c28a14168d48f039..fdd0674d8fbb1a0dbffcfb611d61acc137fa4867 100644 --- a/src/representatives/contrib/francedata/variants.py +++ b/src/representatives/contrib/francedata/variants.py @@ -127,132 +127,132 @@ _get_an_delegations = DelegationHelper({}, {}, False) FranceDataVariants = { "AN": { "chamber": u"Assemblée nationale", - "abbreviation": "AN", - "chamber_url_field": "url_an", - "mail_domain": "@assemblee-nationale.fr", - "off_city": "Paris", + "abbreviation": u"AN", + "chamber_url_field": u"url_an", + "mail_domain": u"@assemblee-nationale.fr", + "off_city": u"Paris", "off_street": u"Rue de l'Université", - "off_number": "126", - "off_code": "75355", + "off_number": u"126", + "off_code": u"75355", "off_name": u"Assemblée nationale", "mandates": [ { - "kind": "chamber", + "kind": u"chamber", "chamber": True, - "abbr": "AN", + "abbr": u"AN", "name": u"Assemblée nationale", "role": u"Député", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "group", + "kind": u"group", "chamber": True, - "abbr": "%(groupe_sigle)s", - "name_path": "groupe/organisme", - "role_path": "groupe/fonction", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "abbr": u"%(groupe_sigle)s", + "name_path": u"groupe/organisme", + "role_path": u"groupe/fonction", + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "department", - "abbr": "%(num_deptmt)s", - "name": "%(nom_circo)s", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "kind": u"department", + "abbr": u"%(num_deptmt)s", + "name": u"%(nom_circo)s", + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "district", - "abbr": "%(num_deptmt)s-%(num_circo)s", + "kind": u"district", + "abbr": u"%(num_deptmt)s-%(num_circo)s", "name_fn": _get_rep_district_name, - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "committee", + "kind": u"committee", "chamber": True, "from": _get_an_committees, - "abbr": "%(abbr)s", - "name": "%(name)s", - "role": "%(role)s", - "start": "%(start)s", - "end": "%(end)s" + "abbr": u"%(abbr)s", + "name": u"%(name)s", + "role": u"%(role)s", + "start": u"%(start)s", + "end": u"%(end)s" }, { - "kind": "delegation", + "kind": u"delegation", "chamber": True, "from": _get_an_delegations, - "abbr": "%(abbr)s", - "name": "%(name)s", - "role": "%(role)s", - "start": "%(start)s", - "end": "%(end)s" + "abbr": u"%(abbr)s", + "name": u"%(name)s", + "role": u"%(role)s", + "start": u"%(start)s", + "end": u"%(end)s" } ] }, "SEN": { "chamber": u"Sénat", - "abbreviation": "SEN", - "chamber_url_field": "url_institution", - "mail_domain": "@senat.fr", - "off_city": "Paris", + "abbreviation": u"SEN", + "chamber_url_field": u"url_institution", + "mail_domain": u"@senat.fr", + "off_city": u"Paris", "off_street": u"Rue de Vaugirard", - "off_number": "15", - "off_code": "75291", + "off_number": u"15", + "off_code": u"75291", "off_name": u"Palais du Luxembourg", "mandates": [ { - "kind": "chamber", + "kind": u"chamber", "chamber": True, - "abbr": "SEN", + "abbr": u"SEN", "name": u"Sénat", "role": u"Sénateur", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "group", + "kind": u"group", "chamber": True, - "abbr": "%(groupe_sigle)s", - "name_path": "groupe/organisme", - "role_path": "groupe/fonction", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "abbr": u"%(groupe_sigle)s", + "name_path": u"groupe/organisme", + "role_path": u"groupe/fonction", + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "department", - "abbr": "%(num_deptmt)s", - "name": "%(nom_circo)s", - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "kind": u"department", + "abbr": u"%(num_deptmt)s", + "name": u"%(nom_circo)s", + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "district", - "abbr": "%(num_deptmt)s-%(num_circo)s", + "kind": u"district", + "abbr": u"%(num_deptmt)s-%(num_circo)s", "name_fn": _get_rep_district_name, - "start": "%(mandat_debut)s", - "end": "%(mandat_fin)s" + "start": u"%(mandat_debut)s", + "end": u"%(mandat_fin)s" }, { - "kind": "committee", + "kind": u"committee", "chamber": True, "from": _get_sen_committees, - "abbr": "%(abbr)s", - "name": "%(name)s", - "role": "%(role)s", - "start": "%(start)s", - "end": "%(end)s" + "abbr": u"%(abbr)s", + "name": u"%(name)s", + "role": u"%(role)s", + "start": u"%(start)s", + "end": u"%(end)s" }, { - "kind": "delegation", + "kind": u"delegation", "chamber": True, "from": _get_sen_delegations, - "abbr": "%(abbr)s", - "name": "%(name)s", - "role": "%(role)s", - "start": "%(start)s", - "end": "%(end)s" + "abbr": u"%(abbr)s", + "name": u"%(name)s", + "role": u"%(role)s", + "start": u"%(start)s", + "end": u"%(end)s" } ] }