From 483b0d2fa20fe291133de4976ed468813d09375a Mon Sep 17 00:00:00 2001 From: Ptitloup Date: Wed, 28 Aug 2019 16:15:15 +0200 Subject: [PATCH 1/2] Update views.py replace extra_params = gateway_params + list(query_list) by extra_params = gateway_params + list(query_dict.items()) In python3.5.3 with Django 1.11, the query_list is empty after parsing (I don't know why) but with this fix, the parameters are ok and the gateway is validate --- cas/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cas/views.py b/cas/views.py index b0e1a23..14e250b 100644 --- a/cas/views.py +++ b/cas/views.py @@ -67,7 +67,7 @@ def _service_url(request, redirect_to=None, gateway=False): for index, item2 in enumerate(gateway_params): if item[0] == item2[0]: gateway_params.pop(index) - extra_params = gateway_params + list(query_list) + extra_params = gateway_params + list(query_dict.items()) #Sort params by key name so they are always in the same order. sorted_params = sorted(extra_params, key=itemgetter(0)) From 148d8b7bf63b59619b79ffba9fd1e179790cbbc1 Mon Sep 17 00:00:00 2001 From: Keith Bauer Date: Mon, 23 Sep 2019 10:11:53 -0500 Subject: [PATCH 2/2] Version bump, Changelog update, Contributors update --- CHANGELOG.md | 3 +++ CONTRIBUTORS | 3 ++- README.md | 4 ++-- docs/source/changelog.rst | 4 ++++ docs/source/conf.py | 4 ++-- setup.py | 3 ++- 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc7ca7..a6f2a68 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +### 1.5.2 +- Fix gateway feature (https://github.com/kstateome/django-cas/pull/91) + ### 1.5.1 - Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 9c78061..2dbe7c1 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -6,4 +6,5 @@ bltravis JordanReiter balsdorf kensler -ryanbagwell \ No newline at end of file +ryanbagwell +ptitloup diff --git a/README.md b/README.md index 7956351..ed1b6df 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ CAS client for Django. This library requires Django 1.5 or above, and Python 2.6, 2.7, 3.4 -Current version: 1.5.1 +Current version: 1.5.2 This is [K-State's fork](https://github.com/kstateome/django-cas) of [the original](https://bitbucket.org/cpcc/django-cas/overview) and includes [several additional features](https://github.com/kstateome/django-cas/#additional-features) as well as features merged from @@ -14,7 +14,7 @@ This is [K-State's fork](https://github.com/kstateome/django-cas) of [the or This project is registered on PyPi as django-cas-client. To install:: - pip install django-cas-client==1.5.1 + pip install django-cas-client==1.5.2 ### Add to URLs diff --git a/docs/source/changelog.rst b/docs/source/changelog.rst index 15eeba1..d44f8c5 100644 --- a/docs/source/changelog.rst +++ b/docs/source/changelog.rst @@ -1,6 +1,10 @@ Changelog ========= +1.5.2 +------------------ +- Fix gateway feature (https://github.com/kstateome/django-cas/pull/91) + 1.5.1 ------------------ - Include request in authenticate and evaluate gateway query_list (https://github.com/kstateome/django-cas/pull/87) diff --git a/docs/source/conf.py b/docs/source/conf.py index c853760..e8319d3 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -58,9 +58,9 @@ # built documents. # # The short X.Y version. -version = '1.5.1' +version = '1.5.2' # The full version, including alpha/beta/rc tags. -release = '1.5.1' +release = '1.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 2faf3ce..77f9521 100644 --- a/setup.py +++ b/setup.py @@ -2,7 +2,7 @@ from setuptools import setup, find_packages -version = '1.5.1' +version = '1.5.2' def read(fname): @@ -13,6 +13,7 @@ def read(fname): version=version, description="Django Cas Client", long_description=read('README.md'), + long_description_content_type='text/markdown', classifiers=[ "Development Status :: 5 - Production/Stable", "Environment :: Web Environment",