~michael.nelson/ubuntu-webcatalog/1267731-import-sca-apps-error

« back to all changes in this revision

Viewing changes to src/webcatalog/auth.py

Committer: Tarmac
Author(s): Łukasz Czyżykowski
Date: 2013-04-16 13:40:21 UTC
mfrom: (178.1.21 upgrade-to-django-1.5)
Revision ID: tarmac-20130416134021-q45ptpwb4bn0payb

[r=michael.nelson] Upgrade to Django 1.5.1

files modified:
django_project/config/main.cfg

django_project/urls.py

fabtasks/django.py

setup.py

src/webcatalog/api/__init__.py

src/webcatalog/api/handlers.py

src/webcatalog/auth.py

src/webcatalog/management/commands/cleanup.py

src/webcatalog/management/commands/import_ratings_stats.py

src/webcatalog/migrations/0015_add_applicationmedia.py

src/webcatalog/migrations/0016_populate_application_media.py

src/webcatalog/models/applications.py

src/webcatalog/schema.py

src/webcatalog/templates/404.html

src/webcatalog/templates/light/index.1col.html

src/webcatalog/templates/webcatalog/app_carousel_widget.html

src/webcatalog/templates/webcatalog/application_detail.html

src/webcatalog/templates/webcatalog/application_list_snippet.html

src/webcatalog/templates/webcatalog/base.html

src/webcatalog/templates/webcatalog/department_overview.html

src/webcatalog/templates/webcatalog/department_overview_snippet.html

src/webcatalog/templates/webcatalog/exhibits_widget.html

src/webcatalog/templates/webcatalog/featured_apps_widget.html

src/webcatalog/templates/webcatalog/index.html

src/webcatalog/templates/webcatalog/recommended_apps_widget.html

src/webcatalog/templates/webcatalog/search_results.html

src/webcatalog/templates/webcatalog/task_list.html

src/webcatalog/templates/webcatalog/top_rated_apps_widget.html

src/webcatalog/tests/factory.py

src/webcatalog/tests/test_commands.py

src/webcatalog/tests/test_preflight.py

src/webcatalog/tests/test_views.py

src/webcatalog/views.py

test_requirements.txt

Show diffs side-by-side

added added

removed removed

src/webcatalog/auth.py

__all__ = [

'SSOOAuthAuthentication',

]

import pytz

from datetime import datetime, timedelta

from django.conf import settings

100

101

tokens = Token.objects.filter(token=oauthtoken,

101

102

consumer__key=consumer_key)

102

103

if (len(tokens) == 0 or

103

tokens[0].updated_at < datetime.now() - TOKEN_CACHE_EXPIRY):

104

tokens[0].updated_at < (

105

datetime.now(pytz.utc) - TOKEN_CACHE_EXPIRY)):

104

106

pieces = web_services.get_data_for_account(

105

107

token=oauthtoken, openid_identifier=consumer_key,

106

108

signature=request.get_parameter('oauth_signature'))

Older »