From 3e22a6a8903ba16463426d8e1e47ffb63189f47d Mon Sep 17 00:00:00 2001
From: tr4ck3ur <tr4ck3ur@style-python.fr>
Date: Mon, 28 Sep 2020 23:34:25 +0200
Subject: [PATCH] Latest fixes for python 3 branch

---
 jm2l/__init__.py                     |  5 +-
 jm2l/auth.py                         |  4 +-
 jm2l/models.py                       |  2 +-
 jm2l/security.py                     |  1 +
 jm2l/templates/Public/Programme.mako |  2 +-
 jm2l/templates/edit_event.mako       |  4 +-
 jm2l/templates/helpers.mako          |  4 +-
 jm2l/templates/layout.mako           | 22 +-------
 jm2l/views.py                        | 82 ++++++++++++++--------------
 9 files changed, 56 insertions(+), 70 deletions(-)

diff --git a/jm2l/__init__.py b/jm2l/__init__.py
index 3b5a18f..d62820a 100644
--- a/jm2l/__init__.py
+++ b/jm2l/__init__.py
@@ -33,10 +33,10 @@ def add_renderer_globals(event):
 # @sched.scheduled_job('cron', day_of_week='sun', hour=22, minute=7)
 def mailer_tasks(config):
     # Send the Welcome Mail
-    mailer = config.registry['mailer']
     contact = DBSession.query(User).filter(User.uid == 1).one()
     request = Request.blank('/', base_url='http://jm2l.linux-azur.org')
     request.registry = config.registry
+    mailer = request.mailer
     for staff_user in DBSession.query(User).filter(User.Staff is True):
         # Skip mail to contact
         if staff_user == contact:
@@ -81,8 +81,7 @@ def main(global_config, **settings):
                           authentication_policy=authentication_policy,
                           authorization_policy=authorization_policy
                           )
-    #config.include('pyramid_mailer')
-    config.include('pyramid_mailer.debug')
+    config.include('pyramid_mailer')
     config.add_subscriber(add_renderer_globals, BeforeRender)
     print(settings)
     # config.registry['mailer'] = mailer_factory_from_settings(settings)
diff --git a/jm2l/auth.py b/jm2l/auth.py
index aae3197..f9fb16d 100644
--- a/jm2l/auth.py
+++ b/jm2l/auth.py
@@ -12,10 +12,12 @@ from .security import check_logged
 import datetime
 import re
 
+
 @view_config(route_name='auth', match_param="action=login", renderer="jm2l:templates/login.mako")
 def login(request):
     return {"comefrom":request.GET.get('from', "")}
 
+
 @view_config(route_name='auth', match_param="action=forgot", renderer="jm2l:templates/login.mako")
 def forgot(request):
     if request.method == 'POST' and request.POST:
@@ -31,7 +33,7 @@ def forgot(request):
                 return { 'forgot': True }
             else:
                 # Send the Forgot Mail
-                mailer = request.registry['mailer']
+                mailer = request.mailer
                 # Prepare Plain Text Message :
                 Mail_template = Template(filename='jm2l/templates/mail_plain.mako')
                 mail_plain = Mail_template.render(request=request, User=UserFound, action="Forgot")
diff --git a/jm2l/models.py b/jm2l/models.py
index 02fd928..e4b2991 100644
--- a/jm2l/models.py
+++ b/jm2l/models.py
@@ -657,7 +657,7 @@ class Event(Base):
     intervenants = relationship(User,
                                 secondary='user_event_link',
                                 backref=backref('participate', uselist=False),
-                                lazy='dynamic')
+                                lazy='subquery')
     interventions = relationship(User_Event, backref="matching_events")
     Salle = relationship(Salles, backref='allevents')
 
diff --git a/jm2l/security.py b/jm2l/security.py
index 7ea0b8a..f5141bb 100644
--- a/jm2l/security.py
+++ b/jm2l/security.py
@@ -15,6 +15,7 @@ def check_logged(request):
         # Don't answer to users that aren't logged
         raise HTTPForbidden(u'Vous devez vous identifier pour obtenir une réponse.')
 
+
 def check_staff(request):
     """ This function is intended to raise an exception if the user is not a Staff member"""
     check_logged(request)
diff --git a/jm2l/templates/Public/Programme.mako b/jm2l/templates/Public/Programme.mako
index d45f06e..959acd6 100644
--- a/jm2l/templates/Public/Programme.mako
+++ b/jm2l/templates/Public/Programme.mako
@@ -132,7 +132,7 @@ if Counter==0:
                         </span>
                     <br/>
                     avec
-                    % for num, inter in enumerate(event.intervenants.all()):
+                    % for num, inter in enumerate(event.intervenants):
                         %if num>0:
                             ,
                         %endif
diff --git a/jm2l/templates/edit_event.mako b/jm2l/templates/edit_event.mako
index 99771da..55b61fd 100644
--- a/jm2l/templates/edit_event.mako
+++ b/jm2l/templates/edit_event.mako
@@ -43,7 +43,7 @@
     <div class="borderbox">
         Intervenants programmés:
         <ul>
-        % if event.intervenants.count()==0:
+        % if len(event.intervenants)==0:
             <i><b>Aucun</b></i>
         % else:
             % for num, iterv in enumerate(event.intervenants):
@@ -160,7 +160,7 @@ DicForm = {
 		<td>
         <u>Les Intervenants:</u>
         <ul>
-        % if event.intervenants.count()==0:
+        % if len(event.intervenants)==0:
             <i><b>Aucun</b></i>
         % else:
             % for num, iterv in enumerate(event.intervenants):
diff --git a/jm2l/templates/helpers.mako b/jm2l/templates/helpers.mako
index 6291edb..29b1b8f 100644
--- a/jm2l/templates/helpers.mako
+++ b/jm2l/templates/helpers.mako
@@ -391,9 +391,9 @@ TabJs = {'select':[], 'desc':[]}
                     </div>
                     % endif
             <br/>
-            % if event.intervenants.count()>1:
+            % if len(event.intervenants)>1:
                 avec
-                % for num, inter in enumerate(event.intervenants.all()):
+                % for num, inter in enumerate(event.intervenants):
                     <%
                     if inter==uprofil:
                         continue
diff --git a/jm2l/templates/layout.mako b/jm2l/templates/layout.mako
index 8ac5f61..9adc839 100644
--- a/jm2l/templates/layout.mako
+++ b/jm2l/templates/layout.mako
@@ -188,18 +188,18 @@ ${helpers.uploader_js()}
     <div class="container">
         <h4>JM2L 2005-2020</h4>
     <p>
-        Concocté par <a href="http://www.linux-azur.org/">Linux Azur</a> ~
+        Concocté par <a href="https://www.linux-azur.org/">Linux Azur</a> ~
         <a href="http://creativecommons.org/licenses/by-sa/4.0/">CopyFriendly</a>
     </p>
     <p>
         +33 6 52 42 31 37 ~ contact at jm2l.linux-azur dot org
     </p>
     <p>
-        Conception et construction en <a href="http://git.linux-azur.org/JM2L/jm2l/src/master">DIY</a> ~
+        Conception et construction en <a href="https://git.linux-azur.org/tr4ck3ur/jm2l/src/branch/feature/python-3-migration">DIY</a> ~
         Hébergé par <a href="http://www.heberg-24.com/"> Heberg24 </a>
     </p>
     <p>
-        Vous avez trouvé un bug ? <a href="http://git.linux-azur.org/JM2L/jm2l/issues">Reportez-le ici</a>
+        Vous avez trouvé un bug ? <a href="https://git.linux-azur.org/tr4ck3ur/jm2l/issues/new">Reportez-le ici</a>
     </p>
     </div>
 </footer>
@@ -222,22 +222,6 @@ ${jsitem | n}
 HandleControls();
 </script>
 
-<!-- Piwik
-<script type="text/javascript">
-  var _paq = _paq || [];
-  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u="//stats.style-python.fr/";
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
-    _paq.push(['setSiteId', 4]);
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
-    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
-  })();
-</script>
-<noscript><p><img src="//stats.style-python.fr/piwik.php?idsite=4" style="border:0;" alt="" /></p></noscript>
- End Piwik Code -->
 % if request.user:
   <script>
 function handlevote() {
diff --git a/jm2l/views.py b/jm2l/views.py
index 15b514c..0a45fb9 100644
--- a/jm2l/views.py
+++ b/jm2l/views.py
@@ -25,6 +25,7 @@ from pyramid_mailer.message import Message
 from .security import check_staff, check_logged
 # Then, standard libs
 import csv
+
 try:
     from StringIO import StringIO
 except ImportError:
@@ -41,7 +42,7 @@ from jm2l.const import CurrentYear
 from passlib.hash import argon2
 
 
-## =-=- Here, We keep some usefull function -=-=
+# =-=- Here, We keep some usefull function -=-=
 def remove_accents(input_str):
     """ This function is intended to remove all accent from input unicode string """
     nkfd_form = unicodedata.normalize('NFKD', input_str)
@@ -70,7 +71,7 @@ def Live(request):
     return {'year': year, "DisplayYear": year, 'events': Events, "logged_in": request.authenticated_userid}
 
 
-## =-=- Here, We handle ICal requests -=-=
+# =-=- Here, We handle ICal requests -=-=
 @view_config(route_name='progr_iCal', renderer="string")
 def ICal_Progamme_Request(request):
     year = int(request.matchdict.get('year', CurrentYear))
@@ -170,40 +171,39 @@ def ICal_Progamme_Dyn_Request(request):
     return cal.to_ical()
 
 
-## =-=- Here, We handle Json requests -=-= 
+## =-=- Here, We handle Json requests -=-=
+
+def url_maker(page_number):
+    query = request.GET
+    query["page"] = str(page_number)
+    return request.current_route_url(_query=query)
+
+
 @view_config(route_name='users_json', renderer="json")
 def JSON_User_Request(request):
     """ Build a JSON answer with active users and pagination handling """
     # Check arguments consitency 
-    pageSize = request.params.get('pageSize', "8")
+    page_size = request.params.get('pageSize', "8")
     current_page = request.params.get('pageNum', "1")
-    UserQuery = request.params.get('searchTerm', u"")
+    user_query = request.params.get('searchTerm', u"")
     # Don't answer to users that aren't logged    
     if not request.user:
         raise HTTPForbidden(u'Vous devez vous identifier pour obtenir une réponse.')
-    # Check consistancy of parameters        
-    if pageSize.isdigit() and current_page.isdigit():
+    # Check constancy of parameters
+    if page_size.isdigit() and current_page.isdigit():
         current_page = int(current_page)
-        pageSize = int(pageSize)
+        page_size = int(page_size)
     else:
         return HTTPBadRequest('pageSize and pageNum accept only digits.')
         # Query database
-    Users = DBSession.query(User.uid, User.nom, User.prenom) \
-        .filter(User.slug.contains(remove_accents(UserQuery)))
-    page_url = paginate.PageURL_WebOb(request)
-    records = paginate.Page(Users, current_page, url=page_url, items_per_page=pageSize)
-    ListMatchUser = map(lambda u: {"id": u.uid, "text": "%s %s" % (u.prenom, u.nom)}, records)
-    return {"Results": ListMatchUser, "Total": records.item_count,
-            "logged_in": request.authenticated_userid}
-
-def get_paginator(request, page=1, items_per_page=10):
-    def url_maker(page_number):
-        query = request.GET
-        query["page"] = str(page_number)
-        return request.current_route_url(_query=query)
-
-    return Page(sql-query-here, page=page, items_per_page=items_per_page, url_maker=url_maker)
+    part = remove_accents(user_query)
+    users_set = DBSession.query(User.uid, User.nom, User.prenom) \
+        .filter(User.slug.contains(part.decode("utf-8"))).all()
 
+    records = paginate.Page(users_set, current_page, url_maker=url_maker, items_per_page=page_size)
+    list_match_user = list(map(lambda u: {"id": u.uid, "text": "%s %s" % (u.prenom, u.nom)}, records))
+    return {"Results": list_match_user, "Total": records.item_count,
+            "logged_in": request.authenticated_userid}
 
 
 @view_config(route_name='tiers_json', renderer="json")
@@ -223,13 +223,13 @@ def JSON_Tiers_Request(request):
     else:
         return HTTPBadRequest('pageSize and pageNum accept only digits.')
         # Query database
-    JTiers = DBSession.query(Tiers.uid, Tiers.name) \
-        .filter(Tiers.slug.contains(remove_accents(TiersQuery)))
+    part = remove_accents(TiersQuery)
+    j_tiers = DBSession.query(Tiers.uid, Tiers.name) \
+        .filter(Tiers.slug.contains(part.decode("utf-8"))).all()
 
-    page_url = paginate.PageURL_WebOb(request)
-    records = paginate.Page(JTiers, current_page, url=page_url, items_per_page=pageSize)
-    ListMatchTiers = map(lambda t: {"id": t.uid, "text": t.name}, records)
-    return {"Results": ListMatchTiers, "Total": records.item_count,
+    records = paginate.Page(j_tiers, current_page, url_maker=url_maker, items_per_page=pageSize)
+    list_match_tiers = list(map(lambda t: {"id": t.uid, "text": t.name}, records.items))
+    return {"Results": list_match_tiers, "Total": records.item_count,
             "logged_in": request.authenticated_userid}
 
 
@@ -237,25 +237,25 @@ def JSON_Tiers_Request(request):
 def JSON_Progamme_Request(request):
     year = int(request.matchdict.get('year', CurrentYear))
     # Initialization
-    DicResult = dict()
+    dic_result = dict()
     # Query database
     # Compute days used by all events matching the specified input year
-    Days = DBSession.query(func.strftime('%d', Event.start_time).label('day')) \
+    days = DBSession.query(func.strftime('%d', Event.start_time).label('day')) \
         .filter(Event.for_year == year) \
-        .filter(Event.event_type != None) \
+        .filter(Event.event_type is not None) \
         .group_by(func.strftime('%d', Event.start_time)).all()
 
-    for Day in Days:
-        Events = DBSession.query(Event) \
+    for Day in days:
+        events = DBSession.query(Event) \
             .filter(Event.for_year == year) \
             .filter(Event.event_type != 'Stand') \
             .filter(text("strftime('%d', start_time) = :dow")).params(dow=Day.day) \
             .order_by(Event.start_time)
 
-        ListEv = []
-        for ev in Events:
+        list_ev = []
+        for ev in events:
             if ev.event_type:
-                ListEv.append({
+                list_ev.append({
                     "uid": "%d/%d" % (year, ev.uid),
                     "desc": ev.name,
                     "startDate": ev.start_time.strftime('%Y-%m-%dT%H:%M:%S+01:00'),
@@ -263,9 +263,9 @@ def JSON_Progamme_Request(request):
                     "placeName": ev.Salle and (ev.Salle.name or "unk"),
                     "status": ev.event_type
                 })
-        DicResult[Day.day] = ListEv
+        dic_result[Day.day] = list_ev
 
-    return {'all': DicResult}
+    return {'all': dic_result}
 
 
 @view_config(route_name='timeline_json', renderer="json")
@@ -2027,8 +2027,8 @@ def edit_tiers_category(request):
                         if dic_result[opt.slug_entity_type]['title'] != opt.entity_type or \
                                 tst[1] != opt.entity_subtype:
                             list_changes.append(('changed', opt.uid,
-                                                dic_result[opt.slug_entity_type]['title'],
-                                                tst[1]))
+                                                 dic_result[opt.slug_entity_type]['title'],
+                                                 tst[1]))
             else:
                 list_changes.append(('remove', opt.uid, opt.entity_type, opt.entity_subtype))