| 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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 continue | 74 continue |
| 77 | 75 |
| 78 print >>file, '||%s^' % domain.decode('idna') | 76 print >>file, '||%s^' % domain.decode('idna') |
| 79 file.close() | 77 file.close() |
| 80 | 78 |
| 81 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '': | 79 if subprocess.check_output(['hg', 'stat', '-R', tempdir]) != '': |
| 82 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-
u', 'hgbot', '-m', 'Updated malwaredomains.com data']) | 80 subprocess.check_call(['hg', '-q', 'commit', '-R', tempdir, '-A', '-
u', 'hgbot', '-m', 'Updated malwaredomains.com data']) |
| 83 subprocess.check_call(['hg', '-q', 'push', '-R', tempdir]) | 81 subprocess.check_call(['hg', '-q', 'push', '-R', tempdir]) |
| 84 finally: | 82 finally: |
| 85 shutil.rmtree(tempdir, ignore_errors=True) | 83 shutil.rmtree(tempdir, ignore_errors=True) |
| OLD | NEW |