| Left: | ||
| Right: |
| LEFT | RIGHT |
|---|---|
| 1 # This file is part of the Adblock Plus website, | 1 # This file is part of the Adblock Plus website, |
| 2 # Copyright (C) 2006-2015 Eyeo GmbH | 2 # Copyright (C) 2006-2015 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 codecs | 16 import codecs |
| 17 import os | 17 import os |
| 18 import tarfile | 18 import tarfile |
| 19 import urllib | 19 import urllib |
| 20 | 20 |
| 21 from sitescripts.subscriptions.subscriptionParser import parse_file, calculate_s upplemented | 21 from sitescripts.subscriptions.subscriptionParser import parse_file, calculate_s upplemented |
| 22 | 22 |
| 23 def get_subscriptions(_): | 23 def get_subscriptions(_): |
| 24 result = {} | 24 result = {} |
| 25 utf8_reader = codecs.getreader('utf8') | 25 utf8_reader = codecs.getreader('utf8') |
| 26 source = urllib.urlopen("https://hg.adblockplus.org/subscriptionlist/archive/d efault.tar.gz") | 26 source = urllib.urlopen("https://hg.adblockplus.org/subscriptionlist/archive/d efault.tar.gz") |
| 27 with tarfile.open(fileobj=source, mode="r|gz") as archive: | 27 try: |
| 28 for fileinfo in archive: | 28 with tarfile.open(fileobj=source, mode="r|gz") as archive: |
| 29 if os.path.splitext(fileinfo.name)[1] != ".subscription": | 29 for fileinfo in archive: |
| 30 continue | 30 if os.path.splitext(fileinfo.name)[1] != ".subscription": |
| 31 continue | |
| 31 | 32 |
| 32 filedata = parse_file(fileinfo.name, utf8_reader(archive.extractfile(filei nfo))) | 33 filedata = parse_file(fileinfo.name, utf8_reader(archive.extractfile(fil einfo))) |
| 33 if filedata.unavailable: | 34 if filedata.unavailable: |
| 34 continue | 35 continue |
| 35 | 36 |
| 36 result[filedata.name] = filedata | 37 result[filedata.name] = filedata |
| 37 source.close() | 38 finally: |
|
Sebastian Noack
2015/02/27 14:42:45
Either:
source = ...
try:
...
finally:
kzar
2015/02/27 14:57:11
Unfortunately "with ... as" wasn't supported, I di
| |
| 39 source.close() | |
| 38 | 40 |
| 39 calculate_supplemented(result) | 41 calculate_supplemented(result) |
| 40 return result.values() | 42 return result.values() |
| LEFT | RIGHT |