replace s

caotek_mesavoirs.egg-info/PKG-INFO

@@ -6,6 +6,7 @@ Home-page: UNKNOWN
 Author: UNKNOWN
 Author-email: UNKNOWN
 License: UNKNOWN
+Description-Content-Type: UNKNOWN
 Description: # README #
         
         

caotek_mesavoirs.egg-info/SOURCES.txt

@@ -1,14 +1,15 @@
 CHANGES.txt
 MANIFEST.in
+README.md
 development.ini
 production.ini
 pytest.ini
+setup.py
 caotek_mesavoirs/__init__.py
 caotek_mesavoirs/layout.py
 caotek_mesavoirs/panels.py
 caotek_mesavoirs/routes.py
 caotek_mesavoirs/security.py
-caotek_mesavoirs/tests.py
 caotek_mesavoirs.egg-info/PKG-INFO
 caotek_mesavoirs.egg-info/SOURCES.txt
 caotek_mesavoirs.egg-info/dependency_links.txt

caotek_mesavoirs.egg-info/requires.txt

@@ -14,6 +14,6 @@ yahoo_finance
 BeautifulSoup
 
 [testing]
-WebTest >= 1.3.1
+WebTest>=1.3.1
 pytest
 pytest-cov

caotek_mesavoirs/layout.py

@@ -1,6 +1,5 @@
 # -*- coding: utf8 -*-
 from pyramid_layout.layout import layout_config
-from pyramid.security import authenticated_userid
 from .security import groupfinder
 from views.default import (
     to_euro,
@@ -27,11 +26,11 @@ class GlobalLayout(object):
         return to_percent(x, d)
 
     def isAnonymous(self):
-        user = authenticated_userid(self.request)
+        user = self.request.authenticated_userid
         return user is None
 
     def isAdmin(self):
-        logged_in = authenticated_userid(self.request)
+        logged_in = self.request.authenticated_userid
         is_admin = False
         if logged_in is not None:
             groups = groupfinder(logged_in, self.request)

caotek_mesavoirs/panels.py

@@ -1,13 +1,12 @@
 # -*- coding: utf8 -*-
 from pyramid_layout.panel import panel_config
-from pyramid.security import authenticated_userid
 
 from .security import groupfinder
 from .models.members import get_member_by_email
 
 @panel_config(name='dropdown_menu_panel', renderer='templates/panels/dropdown_menu_panel.pt')
 def dropdown_menu_panel(context, request):
-    logged_in = authenticated_userid(request)
+    logged_in = request.authenticated_userid
     if logged_in is None:
         return { 'logged_in': '' }
     else:

caotek_mesavoirs/views/actifs.py

@@ -5,11 +5,6 @@ from pyramid.view import (
     view_config,
     forbidden_view_config,
 )
-from pyramid.security import (
-    authenticated_userid,
-    remember,
-    forget,
-)
 from pyramid.httpexceptions import (
     HTTPFound,
     HTTPNotFound,
@@ -74,7 +69,7 @@ def getCurrencyRate(currency):
 @view_config(route_name='actifs_list', renderer='../templates/actifs/actifs_list.pt', permission='view')
 def actifs_list(request):
     url = request.route_url('actifs_list')
-    logged_in = authenticated_userid(request)
+    logged_in = request.authenticated_userid
 
     message = ''
     

caotek_mesavoirs/views/default.py

@@ -5,11 +5,6 @@ from pyramid.view import (
     view_config,
     forbidden_view_config,
 )
-from pyramid.security import (
-    authenticated_userid,
-    remember,
-    forget,
-)
 from pyramid.httpexceptions import (
     HTTPFound,
     HTTPNotFound,
@@ -79,7 +74,7 @@ def to_percent(x, d):
 
 @view_config(route_name='home', renderer='../templates/home.pt', permission='view')
 def home(request):
-    logged_in = authenticated_userid(request)
+    logged_in = request.authenticated_userid
     member = get_member_by_email(request, logged_in)
 
     message = ''

caotek_mesavoirs/views/members.py

@@ -6,7 +6,6 @@ from pyramid.view import (
     forbidden_view_config,
 )
 from pyramid.security import (
-    authenticated_userid,
     remember,
     forget,
 )
@@ -66,7 +65,10 @@ Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser vot
 @view_config(route_name='changer_mdp', renderer='../templates/members/changer_mdp.pt', permission='view')
 def changer_mdp(request):
     url = request.route_url('changer_mdp')
-    logged_in = authenticated_userid(request)
+    import pdb;pdb.set_trace()
+    
+    
+    logged_in = request.authenticated_userid
     message = ''
 
     member = get_member_by_email(request, logged_in)