| 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 def getFallbackData(): | 265 def getFallbackData(): |
| 268 repo = os.path.abspath(get_config().get('subscriptions', 'repository')) | 266 repo = os.path.abspath(get_config().get('subscriptions', 'repository')) |
| 269 redirectdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'defa
ult', os.path.join(repo, 'redirects')]) | 267 redirectdata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'defa
ult', os.path.join(repo, 'redirects')]) |
| 270 gonedata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default'
, os.path.join(repo, 'gone')]) | 268 gonedata = subprocess.check_output(['hg', '-R', repo, 'cat', '-r', 'default'
, os.path.join(repo, 'gone')]) |
| 271 return (redirectdata, gonedata) | 269 return (redirectdata, gonedata) |
| 272 | 270 |
| 273 | 271 |
| 274 def _validate_URL(url): | 272 def _validate_URL(url): |
| 275 parse_result = urlparse(url) | 273 parse_result = urlparse(url) |
| 276 return parse_result.scheme in ('http', 'https') and parse_result.netloc != '
' | 274 return parse_result.scheme in ('http', 'https') and parse_result.netloc != '
' |
| OLD | NEW |