Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: sitescripts/formmail/web/formmail2.py

Issue 29386649: Issue #5011 - Moves formmail template load to handler creation (Closed) Base URL: https://hg.adblockplus.org/sitescripts
Patch Set: Created March 17, 2017, 3:46 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « sitescripts/formmail/test/test_formmail2.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # This file is part of the Adblock Plus web scripts, 1 # This file is part of the Adblock Plus web scripts,
2 # Copyright (C) 2006-2016 Eyeo GmbH 2 # Copyright (C) 2006-2016 Eyeo GmbH
3 # 3 #
4 # Adblock Plus is free software: you can redistribute it and/or modify 4 # Adblock Plus is free software: you can redistribute it and/or modify
5 # it under the terms of the GNU General Public License version 3 as 5 # it under the terms of the GNU General Public License version 3 as
6 # published by the Free Software Foundation. 6 # published by the Free Software Foundation.
7 # 7 #
8 # Adblock Plus is distributed in the hope that it will be useful, 8 # Adblock Plus is distributed in the hope that it will be useful,
9 # but WITHOUT ANY WARRANTY; without even the implied warranty of 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of
10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 # GNU General Public License for more details. 11 # GNU General Public License for more details.
12 # 12 #
13 # You should have received a copy of the GNU General Public License 13 # You should have received a copy of the GNU General Public License
14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. 14 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>.
15 15
16 import datetime 16 import datetime
17 import collections 17 import collections
18 18
19 from sitescripts.utils import get_config, sendMail, encode_email_address 19 from sitescripts.utils import (get_config, sendMail, encode_email_address,
20 get_template)
20 from sitescripts.web import registerUrlHandler, form_handler 21 from sitescripts.web import registerUrlHandler, form_handler
21 22
22 23
23 def get_config_items(): 24 def get_config_items():
24 config = get_config() 25 config = get_config()
25 default_keys = set(config.defaults()) 26 default_keys = set(config.defaults())
26 for name, value in config.items('formmail2'): 27 for name, value in config.items('formmail2'):
27 if name not in default_keys: 28 if name not in default_keys:
28 yield name, value 29 yield name, value
29 30
(...skipping 19 matching lines...) Expand all
49 def make_error(spec, check_type, default_message): 50 def make_error(spec, check_type, default_message):
50 if check_type in spec: 51 if check_type in spec:
51 return spec[check_type].value 52 return spec[check_type].value
52 return default_message 53 return default_message
53 54
54 55
55 def make_handler(name, config): 56 def make_handler(name, config):
56 try: 57 try:
57 url = config['url'].value 58 url = config['url'].value
58 except (KeyError, AttributeError): 59 except (KeyError, AttributeError):
59 raise Exception('No URL configured for form handler:' + name) 60 raise Exception('No URL configured for form handler: ' + name)
60 try: 61 try:
61 template = config['template'].value 62 template = config['template'].value
63 get_template(template, autoescape=False)
62 except (KeyError, AttributeError): 64 except (KeyError, AttributeError):
63 raise Exception('No template configured for form handler:' + name) 65 raise Exception('No template configured for form handler: ' + name)
64 try: 66 try:
65 fields = config['fields'] 67 fields = config['fields']
66 for field, spec in fields.items(): 68 for field, spec in fields.items():
67 spec.value = {s.strip() for s in spec.value.split(',')} 69 spec.value = {s.strip() for s in spec.value.split(',')}
68 except KeyError: 70 except KeyError:
69 raise Exception('No fields configured for form handler:' + name) 71 raise Exception('No fields configured for form handler: ' + name)
70 if len(fields) == 0: 72 if len(fields) == 0:
71 raise Exception('No fields configured for form handler:' + name) 73 raise Exception('No fields configured for form handler: ' + name)
72 74
73 @form_handler 75 @form_handler
74 def handler(environ, start_response, params): 76 def handler(environ, start_response, params):
75 response_headers = [('Content-Type', 'text/plain; charset=utf-8')] 77 response_headers = [('Content-Type', 'text/plain; charset=utf-8')]
76 errors = [] 78 errors = []
77 for field, spec in fields.items(): 79 for field, spec in fields.items():
78 if 'mandatory' in spec.value: 80 if 'mandatory' in spec.value:
79 if field not in params.keys(): 81 if field not in params.keys():
80 errors.append(make_error(spec, 'mandatory', 82 errors.append(make_error(spec, 'mandatory',
81 'No {} entered'.format(field))) 83 'No {} entered'.format(field)))
(...skipping 14 matching lines...) Expand all
96 start_response('200 OK', response_headers) 98 start_response('200 OK', response_headers)
97 return '' 99 return ''
98 100
99 return url, handler 101 return url, handler
100 102
101 103
102 conf_dict = conf_parse(get_config_items()) 104 conf_dict = conf_parse(get_config_items())
103 for name, config in conf_dict.items(): 105 for name, config in conf_dict.items():
104 url, handler = make_handler(name, config) 106 url, handler = make_handler(name, config)
105 registerUrlHandler(url, handler) 107 registerUrlHandler(url, handler)
OLDNEW
« no previous file with comments | « sitescripts/formmail/test/test_formmail2.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld