04453ccf42
py3 does not have dict.has_key any more. You have to use "key in dict" instead. As that works in python2 as well, let's use that. Also some small bits of pep8.
39 lines
1.4 KiB
Python
39 lines
1.4 KiB
Python
# GNU MediaGoblin -- federated, autonomous media hosting
|
|
# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
|
|
#
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Affero General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU Affero General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
import logging
|
|
from mediagoblin.db.models import User
|
|
|
|
_log = logging.getLogger(__name__)
|
|
|
|
|
|
def setup_user_in_request(request):
|
|
"""
|
|
Examine a request and tack on a request.user parameter if that's
|
|
appropriate.
|
|
"""
|
|
if 'user_id' not in request.session:
|
|
request.user = None
|
|
return
|
|
|
|
request.user = User.query.get(request.session['user_id'])
|
|
|
|
if not request.user:
|
|
# Something's wrong... this user doesn't exist? Invalidate
|
|
# this session.
|
|
_log.warn("Killing session for user id %r", request.session['user_id'])
|
|
request.session.invalidate()
|