From c43429165a23e1da69a807f9fe511f063569e4f8 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Sat, 17 Nov 2018 10:03:58 +0100
Subject: [PATCH] preparer pour mysql-connector-python

---
 caotek_mesavoirs/layout.py                       | 2 +-
 caotek_mesavoirs/templates/actifs/actif2_edit.pt | 2 +-
 caotek_mesavoirs/templates/actifs/actif_edit.pt  | 2 +-
 caotek_mesavoirs/views/default.py                | 6 +++---
 development.ini                                  | 2 +-
 setup.py                                         | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/caotek_mesavoirs/layout.py b/caotek_mesavoirs/layout.py
index 10b94ff..b120662 100644
--- a/caotek_mesavoirs/layout.py
+++ b/caotek_mesavoirs/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/caotek_mesavoirs/templates/actifs/actif2_edit.pt b/caotek_mesavoirs/templates/actifs/actif2_edit.pt
index 023992b..8a830c9 100644
--- a/caotek_mesavoirs/templates/actifs/actif2_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/actif2_edit.pt
@@ -85,7 +85,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="actif.no_id <> 0">
+							tal:condition="actif.no_id != 0">
 							<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
 					</div>
 				</div>
diff --git a/caotek_mesavoirs/templates/actifs/actif_edit.pt b/caotek_mesavoirs/templates/actifs/actif_edit.pt
index 462c28b..315aad7 100644
--- a/caotek_mesavoirs/templates/actifs/actif_edit.pt
+++ b/caotek_mesavoirs/templates/actifs/actif_edit.pt
@@ -113,7 +113,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="actif.no_id <> 0">
+							tal:condition="actif.no_id != 0">
 							<span class="glyphicon glyphicon-remove"></span> Supprimer</button>
 					</div>
 				</div>
diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py
index 91218fc..a29f9fc 100644
--- a/caotek_mesavoirs/views/default.py
+++ b/caotek_mesavoirs/views/default.py
@@ -97,7 +97,7 @@ def home(request):
         # totaliser les pourcentages
         total += item.pc_cible
 
-    if total <> 100:
+    if total != 100:
         message = u'Attention, le total de votre répartition cible est incorrect : %s.' % total
 
     # lire les actifs 
@@ -195,7 +195,7 @@ def doc_edit(request):
 
         if len(intitule) > 0 and len(texte) > 0:
             update_doc(request, doc_id, intitule, texte, theme)              
-            if doc_id <> '0':
+            if doc_id != '0':
                 return HTTPFound(location=request.route_url('doc_view', doc_id=doc_id))
             else:
                 return HTTPFound(location=request.route_url('doc_list'))
@@ -203,7 +203,7 @@ def doc_edit(request):
             message = "Veuillez saisir un intitule et un texte."
 
     if 'form.deleted' in request.params:
-        if doc_id <> '0':
+        if doc_id != '0':
             delete_doc(request, doc_id)
             request.session.flash(u"<%s> est supprimée avec succès." % intitule, 'success')
             return HTTPFound(location=request.route_url('doc_list'))
diff --git a/development.ini b/development.ini
index 8a680f3..2974c99 100644
--- a/development.ini
+++ b/development.ini
@@ -19,7 +19,7 @@ pyramid.includes =
     pyramid_tm
     
 sqlalchemy.url = mysql://root:phuoc@localhost/bd_mesavoirs?charset=utf8
-# sqlalchemy.url = mysql://root:phuoc@192.168.1.98/bd_mesavoirs?charset=utf8
+# sqlalchemy.url = mysql+mysqlconnector://root:phuoc@localhost/bd_mesavoirs?charset=utf8
 
 caotek_mesavoirs.admin_email = cao.thienphuoc@bbox.fr
 
diff --git a/setup.py b/setup.py
index 71edff1..1f52d2a 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,6 @@ with open(os.path.join(here, 'CHANGES.txt')) as f:
 
 requires = [
     'pyramid',
-    # 'pyramid_jinja2',
     'pyramid_chameleon',
     'pyramid_debugtoolbar',
     'pyramid_layout',
@@ -21,7 +20,7 @@ requires = [
     'zope.sqlalchemy',
     'waitress',
     'MySQL-python',
-    'docutils',
+    # 'mysql-connector-python',
     'BeautifulSoup',
     ]