From 3bd19138e1eed23cc56aea2d48b9bd3448a33619 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sat, 17 Nov 2018 14:52:53 +0100
Subject: [PATCH] =?UTF-8?q?passage=20=C3=A0=20mysqlclient?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mondumas.egg-info/requires.txt             | 2 +-
 mondumas/layout.py                         | 2 +-
 mondumas/models/default.py                 | 2 +-
 mondumas/templates/agenda/dossier_view.pt  | 2 +-
 mondumas/templates/parametres/user_edit.pt | 2 +-
 mondumas/views/default.py                  | 7 +++++--
 mondumas/views/parametres.py               | 2 +-
 production.ini                             | 1 +
 setup.py                                   | 2 +-
 9 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/mondumas.egg-info/requires.txt b/mondumas.egg-info/requires.txt
index 00874c0..61ca4ab 100644
--- a/mondumas.egg-info/requires.txt
+++ b/mondumas.egg-info/requires.txt
@@ -8,7 +8,7 @@ SQLAlchemy
 transaction
 zope.sqlalchemy
 waitress
-MySQL-python
+mysqlclient
 python-dateutil
 docutils
 
diff --git a/mondumas/layout.py b/mondumas/layout.py
index fd83ba3..988c0c2 100644
--- a/mondumas/layout.py
+++ b/mondumas/layout.py
@@ -1,7 +1,7 @@
 # -*- coding: utf8 -*-
 from pyramid_layout.layout import layout_config
 from .security import groupfinder
-from views.default import (
+from .views.default import (
     to_euro,
     to_percent,
     to_decimal,
diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index b50a4f0..32c02da 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -26,7 +26,7 @@ def get_member_by_mdp_oublie(request, lien):
 
 def get_member_by_id(request, mbr_id):
     if mbr_id == '0':
-        query = "SELECT * FROM P_USERS ORDER BY cd_uti"
+        query = "SELECT * FROM p_users ORDER BY cd_uti"
         results = request.dbsession.execute(query).fetchall()
     else:
         # lire le membres par son identifianr
diff --git a/mondumas/templates/agenda/dossier_view.pt b/mondumas/templates/agenda/dossier_view.pt
index 4693726..f42eff6 100644
--- a/mondumas/templates/agenda/dossier_view.pt
+++ b/mondumas/templates/agenda/dossier_view.pt
@@ -113,7 +113,7 @@
                             </td>
                             <td>
                                 <span tal:condition="detail.rdv_debut==None"></span>
-                                <span tal:condition="detail.rdv_debut<>None">
+                                <span tal:condition="detail.rdv_debut!=None">
                                     <a href="${request.route_url('rdv_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
                                         ${detail.rdv_debut.strftime('%d/%m/%Y %H:%M')}</a>
                                     avec ${detail.LISTE}
diff --git a/mondumas/templates/parametres/user_edit.pt b/mondumas/templates/parametres/user_edit.pt
index 9a60dd8..f9a9c68 100644
--- a/mondumas/templates/parametres/user_edit.pt
+++ b/mondumas/templates/parametres/user_edit.pt
@@ -86,7 +86,7 @@
 						<button class="btn btn-primary" type="submit" name="form.submitted">
 							<span class="glyphicon glyphicon-ok"></span> Enregistrer</button>
 						<button class="btn btn-warning" type="submit" name="form.deleted" 
-							tal:condition="individu.CD_UTI > 0">
+							tal:condition="individu.CD_UTI != '0'">
 							<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
 					</div>
 				</div>
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index 4a1d80d..5d97fef 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -37,6 +37,9 @@ def to_euro(x):
     #else:
     return (u"%.2f €" % x).replace('.', ',')
 
+def to_sha1(message):
+    return hashlib.sha1(message.encode('utf-8')).hexdigest()
+
 def to_int(x):
     try:
         number = int(x.replace(',', '.'))
@@ -100,7 +103,7 @@ def changer_mdp(request):
         if 'form.submitted' in request.params:
             old_password = request.params['old_password']
             new_password = request.params['new_password1']
-            if member.mdp == hashlib.sha1(old_password).hexdigest():
+            if member.mdp == to_sha1(password):
                 update_membre_mdp(request, logged_in, new_password)
                 request.session.flash(u"Votre mot de passe a été mis à jour avec succès.")
                 return HTTPFound(location=request.route_url('home'))
@@ -162,7 +165,7 @@ def login(request):
         record = get_member_by_id(request, login)
         if record :
             # mot de passe hash valide ?
-            if record.mdp == hashlib.sha1(password).hexdigest():
+            if record.mdp == to_sha1(password):
                 update_last_connection(request, login)
                 # force le commit car il ne se fait pas automatiquement après l'update
                 transaction.commit()
diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index 2d964dc..0a7ebd9 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -77,7 +77,7 @@ def user_edit(request):
     if cd_uti == '0':
         # nouveau
         individu = {}
-        individu['cd_uti'] = 0
+        individu['cd_uti'] = '0'
         individu['nom'] = ''
         individu['email'] = ''
         individu['access'] = '0 | Production'
diff --git a/production.ini b/production.ini
index eee3a92..4fb9a6b 100644
--- a/production.ini
+++ b/production.ini
@@ -19,6 +19,7 @@ pyramid.includes =
 	pyramid_exclog
 
 sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8
+sqlalchemy.pool_recycle = 3600
 
 mondumas.admin_email = phuoc@caotek.fr
 
diff --git a/setup.py b/setup.py
index 3226b1f..a78b8a1 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ requires = [
     'transaction',
     'zope.sqlalchemy',
     'waitress',
-    'MySQL-python',
+    'mysqlclient',
     'python-dateutil',
     'docutils',
     ]