From 2c27120eb4a7a45d841ed478c91f560a3024407b Mon Sep 17 00:00:00 2001
From: Lance Edgar <ledgar@sacfoodcoop.com>
Date: Tue, 18 Oct 2016 17:54:41 -0500
Subject: [PATCH] Update references to `request.authenticated_userid`

Per warnings from Pyramid, old method will go away in 1.8
---
 tailbone/subscribers.py | 3 +--
 tailbone/views/auth.py  | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tailbone/subscribers.py b/tailbone/subscribers.py
index b393438b..7d3adc67 100644
--- a/tailbone/subscribers.py
+++ b/tailbone/subscribers.py
@@ -32,7 +32,6 @@ from rattail.db import model
 from rattail.db.auth import has_permission, administrator_role
 
 from pyramid import threadlocal
-from pyramid.security import authenticated_userid
 
 import tailbone
 from tailbone import helpers
@@ -120,7 +119,7 @@ def context_found(event):
     request = event.request
 
     request.user = None
-    uuid = authenticated_userid(request)
+    uuid = request.authenticated_userid
     if uuid:
         request.user = Session.query(model.User).get(uuid)
         if request.user:
diff --git a/tailbone/views/auth.py b/tailbone/views/auth.py
index 308cc858..bc1684f9 100644
--- a/tailbone/views/auth.py
+++ b/tailbone/views/auth.py
@@ -30,7 +30,7 @@ from rattail.db.auth import authenticate_user, set_user_password
 
 import formencode
 from pyramid.httpexceptions import HTTPFound
-from pyramid.security import remember, forget, authenticated_userid
+from pyramid.security import remember, forget
 from pyramid_simpleform import Form
 from webhelpers.html import literal
 from webhelpers.html import tags
@@ -47,7 +47,7 @@ def forbidden(request):
     appropriate view.
     """
     msg = literal("You do not have permission to do that.")
-    if not authenticated_userid(request):
+    if not request.authenticated_userid:
         msg += literal("&nbsp; (Perhaps you should %s?)" %
                        tags.link_to("log in", request.route_url('login')))
         # Store current URL in session, for smarter redirect after login.