sitescripts/urlfixer/web/submitData.py - Issue 29345120: Noissue - Got rid of non-default script encodings

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Side by Side Diff: sitescripts/urlfixer/web/submitData.py

Issue 29345120: Noissue - Got rid of non-default script encodings (Closed)

Patch Set: Created May 28, 2016, 11:32 a.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/urlfixer/bin/topDomains.py ('k') | sitescripts/utils.py » ('j') | no next file with comments »

OLD	NEW
1 # coding: utf-8

2

3 # This file is part of the Adblock Plus web scripts,	1 # This file is part of the Adblock Plus web scripts,

4 # Copyright (C) 2006-2016 Eyeo GmbH	2 # Copyright (C) 2006-2016 Eyeo GmbH

5 #	3 #

6 # 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

7 # 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

8 # published by the Free Software Foundation.	6 # published by the Free Software Foundation.

9 #	7 #

10 # 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,

11 # but WITHOUT ANY WARRANTY; without even the implied warranty of	9 # but WITHOUT ANY WARRANTY; without even the implied warranty of

12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
85 if result == None:	83 if result == None:

86 cursor.execute("INSERT INTO domains(domain) VALUES (%s)", (domain))	84 cursor.execute("INSERT INTO domains(domain) VALUES (%s)", (domain))

87 return db.insert_id()	85 return db.insert_id()

88 else:	86 else:

89 return result["id"]	87 return result["id"]

90	88

91	89

92 def _increment_entry(db, domain_id, status):	90 def _increment_entry(db, domain_id, status):

93 cursor = db.cursor(MySQLdb.cursors.DictCursor)	91 cursor = db.cursor(MySQLdb.cursors.DictCursor)

94 cursor.execute("INSERT INTO corrections(domain, status, curr_month, prev_mon th, curr_year, prev_year) VALUES (%s, %s, %s, %s, %s, %s) ON DUPLICATE KEY UPDAT E curr_month = curr_month + 1, curr_year = curr_year + 1", (domain_id, status, 1 , 0, 1, 0))	92 cursor.execute("INSERT INTO corrections(domain, status, curr_month, prev_mon th, curr_year, prev_year) VALUES (%s, %s, %s, %s, %s, %s) ON DUPLICATE KEY UPDAT E curr_month = curr_month + 1, curr_year = curr_year + 1", (domain_id, status, 1 , 0, 1, 0))

OLD	NEW