Delta Between Two Patch Sets: sitescripts/notifications/parser.py
Issue 29500676:
Issue 5456 - Add support to specify urlFilters in the notification repository (Closed)
Left Patch Set: Addressed formatting comments
Created Aug. 4, 2017, 8:40 a.m.
Right Patch Set: Use assert instead of assertEqual
Created Sept. 21, 2017, 10:09 a.m.
| Left: | ||
| Right: |
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with change/comment
|
« no previous file
|
sitescripts/notifications/test/parser.py » ('j')
|
no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| LEFT | RIGHT |
|---|---|
| 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-2017 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 |
| 11 # GNU General Public License for more details. | 11 # GNU General Public License for more details. |
| 12 # | 12 # |
| (...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 131 if not 'inactive' in notification: | 131 if not 'inactive' in notification: |
| 132 current_time = datetime.datetime.now() | 132 current_time = datetime.datetime.now() |
| 133 start = notification.pop('start', current_time) | 133 start = notification.pop('start', current_time) |
| 134 end = notification.pop('end', current_time) | 134 end = notification.pop('end', current_time) |
| 135 if not start <= current_time <= end: | 135 if not start <= current_time <= end: |
| 136 notification['inactive'] = True | 136 notification['inactive'] = True |
| 137 notifications.append(notification) | 137 notifications.append(notification) |
| 138 except: | 138 except: |
| 139 traceback.print_exc() | 139 traceback.print_exc() |
| 140 return notifications | 140 return notifications |
| LEFT | RIGHT |
« no previous file
|
sitescripts/notifications/test/parser.py » ('j')
|
Toggle Intra-line Diffs ('i')
|
Expand Comments ('e')
|
Collapse Comments ('c')
|
Toggle Comments ('s')
