| OLD | NEW |
| 1 # This file is part of the Adblock Plus web scripts, | 1 # This file is part of the Adblock Plus web scripts, |
| 2 # Copyright (C) 2006-present eyeo GmbH | 2 # Copyright (C) 2006-present 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 |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 database = get_config().get('urlfixer', 'database') | 38 database = get_config().get('urlfixer', 'database') |
| 39 dbuser = get_config().get('urlfixer', 'dbuser') | 39 dbuser = get_config().get('urlfixer', 'dbuser') |
| 40 dbpasswd = get_config().get('urlfixer', 'dbpassword') | 40 dbpasswd = get_config().get('urlfixer', 'dbpassword') |
| 41 if os.name == 'nt': | 41 if os.name == 'nt': |
| 42 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, | 42 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| 43 use_unicode=True, charset='utf8', named_pipe=True
) | 43 use_unicode=True, charset='utf8', named_pipe=True
) |
| 44 else: | 44 else: |
| 45 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, | 45 return MySQLdb.connect(user=dbuser, passwd=dbpasswd, db=database, |
| 46 use_unicode=True, charset='utf8') | 46 use_unicode=True, charset='utf8') |
| 47 | 47 |
| 48 |
| 48 if __name__ == '__main__': | 49 if __name__ == '__main__': |
| 49 setupStderr() | 50 setupStderr() |
| 50 | 51 |
| 51 if len(sys.argv) <= 1: | 52 if len(sys.argv) <= 1: |
| 52 print >>sys.stderr, 'Please specify the domain names as command line par
ameters' | 53 print >>sys.stderr, 'Please specify the domain names as command line par
ameters' |
| 53 sys.exit(1) | 54 sys.exit(1) |
| 54 | 55 |
| 55 forceDomains(sys.argv[1:]) | 56 forceDomains(sys.argv[1:]) |
| OLD | NEW |