diff --git a/cas.py b/cas.py index ce56482..af54035 100644 --- a/cas.py +++ b/cas.py @@ -4,7 +4,7 @@ import requests from lxml import etree -from six.moves.urllib import parse as urllib_parse +from urllib.parse import urljoin, urlencode logger = logging.getLogger(__name__) @@ -103,8 +103,8 @@ def get_login_url(self): params.update({'renew': 'true'}) params.update(self.extra_login_params) - url = urllib_parse.urljoin(self.server_url, 'login') - query = urllib_parse.urlencode(params) + url = urljoin(self.server_url, 'login') + query = urlencode(params) return ''.join([url, '?', query]) def get_logout_url(self, redirect_url=None): @@ -113,10 +113,10 @@ def get_logout_url(self, redirect_url=None): Returns: str: Logout URL """ - url = urllib_parse.urljoin(self.server_url, 'logout') + url = urljoin(self.server_url, 'logout') if redirect_url: params = {self.logout_redirect_param_name: redirect_url} - query = urllib_parse.urlencode(params) + query = urlencode(params) return ''.join([url, '?', query]) return url @@ -127,8 +127,8 @@ def get_proxy_url(self, pgt): str: Proxy URL """ params = {'pgt': pgt, 'targetService': self.service_url} - url = urllib_parse.urljoin(self.server_url, 'proxy') - query = urllib_parse.urlencode(params) + url = urljoin(self.server_url, 'proxy') + query = urlencode(params) return ''.join([url, '?', query]) def get_proxy_ticket(self, pgt): @@ -170,8 +170,7 @@ def verify_ticket(self, ticket): Returns username on success and None on failure. """ params = [('ticket', ticket), ('service', self.service_url)] - url = (urllib_parse.urljoin(self.server_url, 'validate') + '?' + - urllib_parse.urlencode(params)) + url = (urljoin(self.server_url, 'validate') + '?' + urlencode(params)) page = self.session.get( url, stream=True, @@ -211,7 +210,7 @@ def get_verification_response(self, ticket): } if self.proxy_callback: params.update({'pgtUrl': self.proxy_callback}) - base_url = urllib_parse.urljoin(self.server_url, self.url_suffix) + base_url = urljoin(self.server_url, self.url_suffix) page = self.session.get( base_url, params=params, @@ -377,9 +376,7 @@ def fetch_saml_validation(self, ticket): 'content-type': 'text/xml; charset=utf-8', } params = {'TARGET': self.service_url} - saml_validate_url = urllib_parse.urljoin( - self.server_url, 'samlValidate', - ) + saml_validate_url = urljoin(self.server_url, 'samlValidate',) return self.session.post( saml_validate_url, self.get_saml_assertion(ticket), diff --git a/requirements.txt b/requirements.txt index 73e854f..dbf5069 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ lxml>=3.4 -six>=1.0.0 requests>=2.0.0 diff --git a/setup.py b/setup.py index f0782fb..eaf3342 100755 --- a/setup.py +++ b/setup.py @@ -28,7 +28,6 @@ ], python_requires=">=3.10", install_requires=[ - 'six>=1.10.0', 'requests>=2.11.1', 'lxml>=3.4', ],