From 3c72056f6425800ff933342d756a110381de63c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 29 Sep 2016 19:36:25 +0200 Subject: [PATCH] fix errors with redis --- src/c3nav/editor/hosters/base.py | 2 +- src/c3nav/editor/hosters/gitlab.py | 2 +- src/requirements/redis.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 src/requirements/redis.txt diff --git a/src/c3nav/editor/hosters/base.py b/src/c3nav/editor/hosters/base.py index eb2eb359..4040e99e 100644 --- a/src/c3nav/editor/hosters/base.py +++ b/src/c3nav/editor/hosters/base.py @@ -56,7 +56,7 @@ class Hoster(ABC): state = session_data.setdefault('state', 'logged_out') if state == 'checking': - task = request_access_token.AsyncResult(id=session_data.get('checking_progress_id')) + task = request_access_token.AsyncResult(task_id=session_data.get('checking_progress_id')) self._handle_checking_task(request, task, session_data) state = session_data['state'] diff --git a/src/c3nav/editor/hosters/gitlab.py b/src/c3nav/editor/hosters/gitlab.py index 60df55d4..e2171f94 100644 --- a/src/c3nav/editor/hosters/gitlab.py +++ b/src/c3nav/editor/hosters/gitlab.py @@ -23,7 +23,7 @@ class GitlabHoster(Hoster): oauth_csrf_token = get_random_string(42, string.ascii_letters+string.digits) self._get_session_data(request)['oauth_csrf_token'] = oauth_csrf_token - callback_uri = self._get_callback_uri(request) + callback_uri = self._get_callback_uri(request).replace('://localhost:8000', 's://33c3.c3nav.de') self._get_session_data(request)['callback_uri'] = callback_uri return self.get_endpoint('/oauth/authorize?%s' % urlencode(( diff --git a/src/requirements/redis.txt b/src/requirements/redis.txt new file mode 100644 index 00000000..11ae9e71 --- /dev/null +++ b/src/requirements/redis.txt @@ -0,0 +1,2 @@ +django-redis>=4.1,<4.2 +redis>=2.10,<2.11