diff options
| author | Alban Gruin | 2017-09-09 16:39:30 +0200 |
|---|---|---|
| committer | Alban Gruin | 2017-09-09 16:39:30 +0200 |
| commit | 5c96538dfe708c4429d13397caedeb0b84a65b5a (patch) | |
| tree | 855a9f31cb40a35805129d4f9edd3eac274cc11f /utils.py | |
| parent | ab9df7a174e2debbf9c644c8ec3e2127eeeaa3cf (diff) | |
| parent | 60ea5a0e2a5f61f7f764bcf01aafb362781c16da (diff) | |
Merge branch 'stable/0.9.z' into prod/pa1ch/0.y.z
Diffstat (limited to 'utils.py')
| -rw-r--r-- | utils.py | 19 |
1 files changed, 9 insertions, 10 deletions
@@ -1,18 +1,17 @@ # Copyright (C) 2017 Alban Gruin # -# celcatsanitizer is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# celcatsanitizer is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published +# by the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # # celcatsanitizer is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# GNU Affero General Public License for more details. # -# You should have received a copy of the GNU General Public License along -# with celcatsanitizer; if not, write to the Free Software Foundation, Inc., -# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# You should have received a copy of the GNU Affero General Public License +# along with celcatsanitizer. If not, see <http://www.gnu.org/licenses/>. from django.utils import timezone @@ -53,9 +52,9 @@ def parse_group(name): # ^ début de la ligne # ([\w ]+?) correspond à au moins un caractère # (\s* zéro, un ou plusieurs espaces - # (((CM)(\w))| correspond à CM suivi d'une lettre ou... - # ((TD)(\w)(\d))| ... à TD suivi d’une lettre et d'un chiffre ou... - # ((TP)(\w)(\d)(\d))) ... à TP suivi d’une lettre et de deux chiffres + # (((CM)(\w))| correspond à CM suivi d'une lettre ou… + # ((TD)(\w)(\d))| … à TD suivi d’une lettre et d'un chiffre ou… + # ((TP)(\w)(\d)(\d))) … à TP suivi d’une lettre et de deux chiffres # )? groupe optionel # $ fin de la ligne group_regex = re.compile("^([\w ]+?)(\s*(((CM)(\w))|((TD)(\w)(\d))|((TP)(\w)(\d)(\d))))?$") |