From 7e6af723e15a785b403010de4b44b49fce924e91 Mon Sep 17 00:00:00 2001 From: Johannes Holmberg Date: Thu, 16 Feb 2012 13:57:18 +0100 Subject: [PATCH] Add own tuple_index function to stay compatible with python 2.5 --- social_auth/backends/pipeline/misc.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/social_auth/backends/pipeline/misc.py b/social_auth/backends/pipeline/misc.py index 22b0e19..752b545 100644 --- a/social_auth/backends/pipeline/misc.py +++ b/social_auth/backends/pipeline/misc.py @@ -4,18 +4,22 @@ from social_auth.utils import setting PIPELINE_ENTRY = 'social_auth.backends.pipeline.misc.save_status_to_session' +def tuple_index(t, e): + for (i, te) in enumerate(t): + if te == e: + return i + return None def save_status_to_session(request, auth, *args, **kwargs): """Saves current social-auth status to session.""" next_entry = setting('SOCIAL_AUTH_PIPELINE_RESUME_ENTRY') - try: - if next_entry: - idx = PIPELINE.index(next_entry) - else: - idx = PIPELINE.index(PIPELINE_ENTRY) + 1 - except ValueError: - idx = None + if next_entry: + idx = tuple_index(PIPELINE, next_entry) + else: + idx = tuple_index(PIPELINE, PIPELINE_ENTRY) + if idx: + idx += 1 data = auth.to_session_dict(idx, *args, **kwargs) -- 2.39.5