# HG changeset patch # User Dennis Fink # Date 2015-10-16 20:39:49 # Node ID 4abf18c39fcd0d69ea40734fb927aac4a76ffa27 # Parent 93ef71745598079b555d39f85f1f66f7a126d514 Remove united_kingdom and united_states diff --git a/ennstatus/donate/views.py b/ennstatus/donate/views.py --- a/ennstatus/donate/views.py +++ b/ennstatus/donate/views.py @@ -7,13 +7,6 @@ from ennstatus.donate.functions import l from ennstatus.root.forms import BPMForm from ennstatus.root.constants import BPM_ADDRESSES -COUNTRIES = [ - ('luxembourg', 'Luxembourg'), - ('belgium', 'Belgium'), - ('france', 'France'), - ('germany', 'Germany'), -] - donate_page = Blueprint('donate', __name__) @@ -22,7 +15,6 @@ def index(): current_app.logger.info('Handling index') form = BPMForm() - form.country.choices = COUNTRIES country_choices = [choice[0] for choice in form.country.choices] if request.method == 'POST': diff --git a/ennstatus/root/constants.py b/ennstatus/root/constants.py --- a/ennstatus/root/constants.py +++ b/ennstatus/root/constants.py @@ -1,17 +1,5 @@ BPM_ADDRESSES = { - 'united_kingdom': { - 'address': '372 Old Street', - 'postal_code': 'EC1V 9AU', - 'city': 'London', - 'country': 'United Kingdom', - }, - 'united_states': { - 'address': '8345 NW 66 Street 2000', - 'postal_code': '33166-2626', - 'city': 'Miami', - 'country': 'United States of America', - }, 'germany': { 'address': 'Zum Bürgerwehr 28', 'postal_code': 'D-54516', diff --git a/ennstatus/root/forms.py b/ennstatus/root/forms.py --- a/ennstatus/root/forms.py +++ b/ennstatus/root/forms.py @@ -10,8 +10,6 @@ from wtforms.validators import InputRequ COUNTRIES = [ ('luxembourg', 'Luxembourg'), - ('united_kingdom', 'United Kingdom'), - ('united_states', 'United States of America'), ('belgium', 'Belgium'), ('france', 'France'), ('germany', 'Germany'),