| 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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 126 if not "inactive" in notification: | 124 if not "inactive" in notification: |
| 127 current_time = datetime.datetime.now() | 125 current_time = datetime.datetime.now() |
| 128 start = notification.pop("start", current_time) | 126 start = notification.pop("start", current_time) |
| 129 end = notification.pop("end", current_time) | 127 end = notification.pop("end", current_time) |
| 130 if not start <= current_time <= end: | 128 if not start <= current_time <= end: |
| 131 notification["inactive"] = True | 129 notification["inactive"] = True |
| 132 notifications.append(notification) | 130 notifications.append(notification) |
| 133 except: | 131 except: |
| 134 traceback.print_exc() | 132 traceback.print_exc() |
| 135 return notifications | 133 return notifications |
| OLD | NEW |