sitescripts/subscriptions/combineSubscriptions.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/subscriptions/combineSubscriptions.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:

OLD	NEW
1 #!/usr/bin/env python	1 #!/usr/bin/env python

2 # coding: utf-8

3	2

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

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

6 #	5 #

7 # Adblock Plus is free software: you can redistribute it and/or modify	6 # Adblock Plus is free software: you can redistribute it and/or modify

8 # it under the terms of the GNU General Public License version 3 as	7 # it under the terms of the GNU General Public License version 3 as

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

10 #	9 #

11 # Adblock Plus is distributed in the hope that it will be useful,	10 # Adblock Plus is distributed in the hope that it will be useful,

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

(...skipping 322 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
335	334

336 timeout = 30	335 timeout = 30

337 for option, value in opts:	336 for option, value in opts:

338 if option in ("-h", "--help"):	337 if option in ("-h", "--help"):

339 usage()	338 usage()

340 sys.exit()	339 sys.exit()

341 elif option in ("-t", "--timeout"):	340 elif option in ("-t", "--timeout"):

342 timeout = int(value)	341 timeout = int(value)

343	342

344 combine_subscriptions(sources, target_dir, timeout)	343 combine_subscriptions(sources, target_dir, timeout)

OLD	NEW