crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PEP8 + un peu de nettoyage

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-09-25 01:17:46 +02:00
parent 13555c735d
commit 2c1674038e
1 changed files with 21 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gestion/gest_crans.py
View file

@ -29,8 +29,8 @@ from whos import aff
import signal import signal
import getopt import getopt
from time import strftime, strptime, localtime, mktime, time from time import strftime, strptime, localtime, mktime, time
from dateutil import relativedelta as rdelta import datetime
from datetime import date from dateutil.relativedelta import relativedelta
import re import re
import subprocess import subprocess
import affich_tools import affich_tools
@ -54,6 +54,8 @@ iscontroleur = u'Tresorier' in droits
isbureau = u'Bureau' in droits isbureau = u'Bureau' in droits
encoding = sys.stdin.encoding or 'UTF-8' encoding = sys.stdin.encoding or 'UTF-8'
NAISSANCE_RE = re.compile(r"(?P<jour>[^ ]*)/(?P<mois>[^ ]*)/(?P<annee>[^ ]*)")
if u'Nounou' in droits: if u'Nounou' in droits:
# Si on est nounou # Si on est nounou
if os.path.exists(os.path.expanduser('~/.dialogrc')): if os.path.exists(os.path.expanduser('~/.dialogrc')):
@ -113,14 +115,20 @@ def set_bases(adher):
# Traitement # Traitement
err = '' err = ''
try: adher.nom(result[0]) try:
except ValueError, c: err += c.args[0] + '\n' adher.nom(result[0])
except ValueError, c:
err += c.args[0] + '\n'
try: adher.prenom(result[1]) try:
except ValueError, c: err += c.args[0] + '\n' adher.prenom(result[1])
except ValueError, c:
err += c.args[0] + '\n'
try: adher.tel(result[2]) try:
except ValueError, c: err += c.args[0] + '\n' adher.tel(result[2])
except ValueError, c:
err += c.args[0] + '\n'
# Un adhérent du même nom existe-t-il déjà ? # Un adhérent du même nom existe-t-il déjà ?
req = 'nom=' + result[0] + '&prenom=' + result[1] req = 'nom=' + result[0] + '&prenom=' + result[1]
@ -133,15 +141,14 @@ def set_bases(adher):
return 1 return 1
# On controle que l'adh est majeur # On controle que l'adh est majeur
Now = date.today() naissance = NAISSANCE_RE.match(result[4].decode(config.in_encoding))
naissance = re.compile(r"(?P<jour>[^ ]*)/(?P<mois>[^ ]*)/(?P<annee>[^ ]*)").match(unicode(result[4]))
if naissance is None: if naissance is None:
err += "La date est invalide" err += "La date est invalide"
else: else:
naissance = naissance.groupdict() naissance = naissance.groupdict()
try: try:
naissance_date = date(int(naissance['annee']),int(naissance['mois']),int(naissance['jour'])) naissance_date = datetime.date(int(naissance['annee']), int(naissance['mois']), int(naissance['jour']))
age = rdelta.relativedelta(Now, naissance_date).years age = relativedelta(datetime.date.today(), naissance_date).years
if age < 18: if age < 18:
arg = u'--title "Inscription adhérent" ' arg = u'--title "Inscription adhérent" '
arg += u'--yesno "Cet adhérent est mineur, merci de demander un accord écrit des parents' arg += u'--yesno "Cet adhérent est mineur, merci de demander un accord écrit des parents'
@ -149,7 +156,8 @@ def set_bases(adher):
no, res = dialog(arg) no, res = dialog(arg)
if no: if no:
return 1 return 1
except ValueError, c: err += c.args[0] + '\n' except ValueError, c:
err += c.args[0] + '\n'
err += _set_chbre(adher, result[3]) err += _set_chbre(adher, result[3])