sitescripts/subscriptions/bin/updateMalwareDomainsList.py - Issue 29333964: Issue 3537 - Remove obsolete workaround for Malware Domains List breaking YouTube

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/bin/updateMalwareDomainsList.py

Issue 29333964: Issue 3537 - Remove obsolete workaround for Malware Domains List breaking YouTube (Closed)

Patch Set: Created Jan. 19, 2016, 12:41 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 # coding: utf-8	1 # coding: utf-8

2	2

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

4 # Copyright (C) 2006-2015 Eyeo GmbH	4 # Copyright (C) 2006-2015 Eyeo GmbH

5 #	5 #

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

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

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

9 #	9 #

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

(...skipping 26 matching lines...) Expand all Loading...
37 !'''	37 !'''

38	38

39 data = urllib.urlopen('http://mirror3.malwaredomains.com/files/justdomains.z ip').read()	39 data = urllib.urlopen('http://mirror3.malwaredomains.com/files/justdomains.z ip').read()

40 zip = zipfile.ZipFile(StringIO(data), 'r')	40 zip = zipfile.ZipFile(StringIO(data), 'r')

41 info = zip.infolist()[0]	41 info = zip.infolist()[0]

42 for line in str(zip.read(info.filename)).splitlines():	42 for line in str(zip.read(info.filename)).splitlines():

43 domain = line.strip()	43 domain = line.strip()

44 if not domain:	44 if not domain:

45 continue	45 continue

46	46

47 # HACK: Ignore entry that currently breaks YouTube, see #3521

48 if domain == 's.ytimg.com':

49 continue

50

51 print >>file, '\|\|%s^' % domain.decode('idna')	47 print >>file, '\|\|%s^' % domain.decode('idna')

52 file.close();	48 file.close();

53	49

54 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '':	50 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '':

55 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-u', 'h gbot', '-m', 'Updated malwaredomains.com data'])	51 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-u', 'h gbot', '-m', 'Updated malwaredomains.com data'])

56 subprocess.check_call(['hg', '-q', 'push', '-R', tempdir])	52 subprocess.check_call(['hg', '-q', 'push', '-R', tempdir])

57 finally:	53 finally:

58 shutil.rmtree(tempdir, ignore_errors=True)	54 shutil.rmtree(tempdir, ignore_errors=True)

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »