.sitescripts.example - Issue 5177883412660224: Issue 2234 - Add a WSGI controller to collect email addresses for the Adblock Browser iOS launch

Side by Side Diff: .sitescripts.example

Issue 5177883412660224: Issue 2234 - Add a WSGI controller to collect email addresses for the Adblock Browser iOS launch (Closed)

Patch Set: Use parse_qs() instead dict(parse_qsl()) Created April 21, 2015, 3:07 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

OLD	NEW
1 [DEFAULT]	1 [DEFAULT]

2 root=/server/root/path	2 root=/server/root/path

3 mailer=/usr/sbin/sendmail	3 mailer=/usr/sbin/sendmail

4 mailerDebug=no	4 mailerDebug=no

5 secret=somerandomstringhere	5 secret=somerandomstringhere

6	6

7 [multiplexer]	7 [multiplexer]

8 sitescripts.subscriptions.web.fallback =	8 sitescripts.subscriptions.web.fallback =

9 sitescripts.crashes.web.submitCrash =	9 sitescripts.crashes.web.submitCrash =

10 sitescripts.reports.web.submitReport =	10 sitescripts.reports.web.submitReport =

11 sitescripts.reports.web.updateReport =	11 sitescripts.reports.web.updateReport =

12 sitescripts.reports.web.showDigest =	12 sitescripts.reports.web.showDigest =

13 sitescripts.reports.web.showUser =	13 sitescripts.reports.web.showUser =

14 sitescripts.formmail.web.formmail =	14 sitescripts.formmail.web.formmail =

	15 sitescripts.submitEmail.web.submitEmail =

15 sitescripts.crawler.web.crawler =	16 sitescripts.crawler.web.crawler =

16 sitescripts.urlfixer.web.submitData =	17 sitescripts.urlfixer.web.submitData =

17 sitescripts.extensions.web.downloads =	18 sitescripts.extensions.web.downloads =

18 sitescripts.filterhits.web.submit =	19 sitescripts.filterhits.web.submit =

19 sitescripts.filterhits.web.query =	20 sitescripts.filterhits.web.query =

20	21

21 [subscriptions]	22 [subscriptions]

22 repository=%(root)s/hg/subscriptionlist	23 repository=%(root)s/hg/subscriptionlist

23 statusTemplate=subscriptions/template/status.html	24 statusTemplate=subscriptions/template/status.html

24 statusPage=%(root)s/www/subscriptionStatus.html	25 statusPage=%(root)s/www/subscriptionStatus.html

(...skipping 129 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
154 cvsroot=:pserver:guest@mozdev.org:/cvs	155 cvsroot=:pserver:guest@mozdev.org:/cvs

155 cvsdir=adblockplus/www/easylist	156 cvsdir=adblockplus/www/easylist

156	157

157 [hg]	158 [hg]

158 auth_repository=%(root)s/hg/hgaccess	159 auth_repository=%(root)s/hg/hgaccess

159 auth_file=%(root)s/.ssh/.ssh/authorized_keys	160 auth_file=%(root)s/.ssh/.ssh/authorized_keys

160	161

161 [formmail]	162 [formmail]

162 template=formmail/template/eyeo.mail	163 template=formmail/template/eyeo.mail

163	164

	165 [submitEmail]

	166 verifiedEmailAddressesFile=%(root)s/logs/verified_email_addresses.txt
	kzar 2015/04/21 17:14:31 Nit: These option names seem a bit long, also aren Nit: These option names seem a bit long, also aren't we using "snake case" for options generally? Sebastian Noack 2015/04/21 18:10:30 Do you have a better (meaningful) name? The notat Show quoted text On 2015/04/21 17:14:31, kzar wrote: > Nit: These option names seem a bit long, also aren't we using "snake case" for > options generally? Do you have a better (meaningful) name? The notation of option names seems to be mixed. @Wladimir: Your call. kzar 2015/04/22 09:17:46 Well for example instead of unknownVerificationCod Show quoted text On 2015/04/21 18:10:30, Sebastian Noack wrote: > On 2015/04/21 17:14:31, kzar wrote: > > Nit: These option names seem a bit long, also aren't we using "snake case" for > > options generally? > > Do you have a better (meaningful) name? > > The notation of option names seems to be mixed. @Wladimir: Your call. Well for example instead of unknownVerificationCodeRedirectLocation how about failedVerificationURL or failedVerificationPage? Sebastian Noack 2015/04/22 10:06:00 I think I prefer the more descriptive names I use Show quoted text On 2015/04/22 09:17:46, kzar wrote: > On 2015/04/21 18:10:30, Sebastian Noack wrote: > > On 2015/04/21 17:14:31, kzar wrote: > > > Nit: These option names seem a bit long, also aren't we using "snake case" > for > > > options generally? > > > > Do you have a better (meaningful) name? > > > > The notation of option names seems to be mixed. @Wladimir: Your call. > > Well for example instead of unknownVerificationCodeRedirectLocation how about > failedVerificationURL or failedVerificationPage? I think I prefer the more descriptive names I use there, making it clear that a redirect is issued to that location. If possible I prefer single word names too, but this isn't possible here and whether 3 or 5 words doesn't really matter IMO. kzar 2015/04/22 10:13:04 I don't think the extra words add anything, but it Show quoted text On 2015/04/22 10:06:00, Sebastian Noack wrote: > On 2015/04/22 09:17:46, kzar wrote: > > On 2015/04/21 18:10:30, Sebastian Noack wrote: > > > On 2015/04/21 17:14:31, kzar wrote: > > > > Nit: These option names seem a bit long, also aren't we using "snake case" > > for > > > > options generally? > > > > > > Do you have a better (meaningful) name? > > > > > > The notation of option names seems to be mixed. @Wladimir: Your call. > > > > Well for example instead of unknownVerificationCodeRedirectLocation how about > > failedVerificationURL or failedVerificationPage? > > I think I prefer the more descriptive names I use there, making it clear that a > redirect is issued to that location. > > If possible I prefer single word names too, but this isn't possible here and > whether 3 or 5 words doesn't really matter IMO. I don't think the extra words add anything, but it doesn't really matter enough to waste time discussing further I guess. Sebastian Noack 2015/04/23 14:29:34 I discussed that with Wladimir on IRC. And we agre Show quoted text On 2015/04/21 18:10:30, Sebastian Noack wrote: > On 2015/04/21 17:14:31, kzar wrote: > > Nit: These option names seem a bit long, also aren't we using "snake case" for > > options generally? > The notation of option names seems to be mixed. @Wladimir: Your call. I discussed that with Wladimir on IRC. And we agreed to use underscores for new options and sections. I changed the names here receptively. While on it, I also renamed the modules to use PEP-8 compliant underscore notation. Wladimir Palant 2015/04/23 14:39:25 Could you please rename the files back now and do Show quoted text On 2015/04/23 14:29:34, Sebastian Noack wrote: > While on it, I also renamed the modules to use PEP-8 compliant underscore > notation. Could you please rename the files back now and do the renaming as a separate patchset? Not sure whether you noticed but Rietveld doesn't understand renaming and treats each renamed file as a new file. Consequently, interdiffs no longer work and figuring out what changed is tedious to say the least. Sebastian Noack 2015/04/23 14:48:56 Done. Show quoted text On 2015/04/23 14:39:25, Wladimir Palant wrote: > On 2015/04/23 14:29:34, Sebastian Noack wrote: > > While on it, I also renamed the modules to use PEP-8 compliant underscore > > notation. > > Could you please rename the files back now and do the renaming as a separate > patchset? Not sure whether you noticed but Rietveld doesn't understand renaming > and treats each renamed file as a new file. Consequently, interdiffs no longer > work and figuring out what changed is tedious to say the least. Done.
	167 pendingVerficationsDirectory=%(root)s/logs/pending_email_verifications

	168 verificationEmailTemplate=submitEmail/template/verification.mail

	169 successfulVerificationRedirectLocation=https://adblockplus.org/en/adblock-browse r/verification-success

	170 unknownVerificationCodeRedirectLocation=https://adblockplus.org/en/adblock-brows er/verification-not-valid

	171

164 [notifications]	172 [notifications]

165 repository=%(root)s/hg/notifications	173 repository=%(root)s/hg/notifications

166 output=%(root)s/www/notification.json	174 output=%(root)s/www/notification.json

167	175

168 [filterhitstats]	176 [filterhitstats]

169 interval=3600	177 interval=3600

170 log_dir=/var/log/filterhits	178 log_dir=/var/log/filterhits

171 dbuser=user	179 dbuser=user

172 dbpassword=password	180 dbpassword=password

173 database=db	181 database=db

174 test_dbuser=test_user	182 test_dbuser=test_user

175 test_dbpassword=test_password	183 test_dbpassword=test_password

176 test_database=test_db	184 test_database=test_db

OLD	NEW

« no previous file with comments | « no previous file | sitescripts/submitEmail/__init__.py » ('j') | sitescripts/submitEmail/web/submitEmail.py » ('J')