From e0dc0532815a011634ad659f4c53daade4d1b523 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Tue, 8 Feb 2022 20:19:09 +0100 Subject: [PATCH 1/9] Remove support for Python 3.6. Supported set: 3.7, 3.8, 3.9. 3.10 . --- setup.py | 3 ++- src/oidcmsg/__init__.py | 2 +- tox.ini | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py index cc8b161..03527b6 100644 --- a/setup.py +++ b/setup.py @@ -62,9 +62,10 @@ def run_tests(self): classifiers=[ "Development Status :: 4 - Beta", "License :: OSI Approved :: Apache Software License", - "Programming Language :: Python :: 3.6", "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", + "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Topic :: Software Development :: Libraries :: Python Modules"], install_requires=[ "cryptojwt==1.6.1", diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py index 388b6ff..ef1bd14 100644 --- a/src/oidcmsg/__init__.py +++ b/src/oidcmsg/__init__.py @@ -1,5 +1,5 @@ __author__ = "Roland Hedberg" -__version__ = "1.5.4" +__version__ = "1.6.0" import os from typing import Dict diff --git a/tox.ini b/tox.ini index aed43e0..74bf2d2 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,5 @@ [tox] -envlist = py{36,37,38},docs,quality +envlist = py{37,38,39,310},docs,quality [testenv] passenv = CI TRAVIS TRAVIS_* From c9f09555e3e0cecbed2595f70510aeb57da82c35 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:41:40 +0100 Subject: [PATCH 2/9] Allow an attribute to be set to no value (None, [], ..) before being assigning a value. --- src/oidcmsg/configure.py | 2 +- src/oidcmsg/context.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/oidcmsg/configure.py b/src/oidcmsg/configure.py index 26f65cb..2e766dc 100644 --- a/src/oidcmsg/configure.py +++ b/src/oidcmsg/configure.py @@ -105,7 +105,7 @@ def __getattr__(self, item, default=None): return default def __setattr__(self, key, value): - if key in self: + if key in self and self.key: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) diff --git a/src/oidcmsg/context.py b/src/oidcmsg/context.py index e30c9e6..274ec5b 100644 --- a/src/oidcmsg/context.py +++ b/src/oidcmsg/context.py @@ -5,7 +5,6 @@ from cryptojwt.key_jar import init_key_jar from oidcmsg.impexp import ImpExp -from oidcmsg.message import Message def add_issuer(conf, issuer): From 62a13d64fcdff8b0b3503d0840af7901121df9b8 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:42:18 +0100 Subject: [PATCH 3/9] Allow an attribute to be set to no value (None, [], ..) before being assigning a value. --- src/oidcmsg/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py index 388b6ff..9068454 100644 --- a/src/oidcmsg/__init__.py +++ b/src/oidcmsg/__init__.py @@ -1,5 +1,5 @@ __author__ = "Roland Hedberg" -__version__ = "1.5.4" +__version__ = "1.6.1" import os from typing import Dict From 82af372b68485681bb94f52f2e719636733cae80 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:43:44 +0100 Subject: [PATCH 4/9] Revert "Allow an attribute to be set to no value (None, [], ..) before being assigning a value." This reverts commit 62a13d64fcdff8b0b3503d0840af7901121df9b8. --- src/oidcmsg/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py index 9068454..388b6ff 100644 --- a/src/oidcmsg/__init__.py +++ b/src/oidcmsg/__init__.py @@ -1,5 +1,5 @@ __author__ = "Roland Hedberg" -__version__ = "1.6.1" +__version__ = "1.5.4" import os from typing import Dict From c76a2ccc0d83ef63ea7d17f2a634b529380feb7d Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:43:53 +0100 Subject: [PATCH 5/9] Revert "Allow an attribute to be set to no value (None, [], ..) before being assigning a value." This reverts commit c9f09555e3e0cecbed2595f70510aeb57da82c35. --- src/oidcmsg/configure.py | 2 +- src/oidcmsg/context.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/oidcmsg/configure.py b/src/oidcmsg/configure.py index 2e766dc..26f65cb 100644 --- a/src/oidcmsg/configure.py +++ b/src/oidcmsg/configure.py @@ -105,7 +105,7 @@ def __getattr__(self, item, default=None): return default def __setattr__(self, key, value): - if key in self and self.key: + if key in self: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) diff --git a/src/oidcmsg/context.py b/src/oidcmsg/context.py index 274ec5b..e30c9e6 100644 --- a/src/oidcmsg/context.py +++ b/src/oidcmsg/context.py @@ -5,6 +5,7 @@ from cryptojwt.key_jar import init_key_jar from oidcmsg.impexp import ImpExp +from oidcmsg.message import Message def add_issuer(conf, issuer): From 00025554e637ad713ec2bffcc59ad806b37ea57d Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:44:58 +0100 Subject: [PATCH 6/9] Allow an attribute to be set to no value (None, [], ..) before being assigning a value. --- src/oidcmsg/__init__.py | 2 +- src/oidcmsg/configure.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py index 388b6ff..9068454 100644 --- a/src/oidcmsg/__init__.py +++ b/src/oidcmsg/__init__.py @@ -1,5 +1,5 @@ __author__ = "Roland Hedberg" -__version__ = "1.5.4" +__version__ = "1.6.1" import os from typing import Dict diff --git a/src/oidcmsg/configure.py b/src/oidcmsg/configure.py index 26f65cb..2e766dc 100644 --- a/src/oidcmsg/configure.py +++ b/src/oidcmsg/configure.py @@ -105,7 +105,7 @@ def __getattr__(self, item, default=None): return default def __setattr__(self, key, value): - if key in self: + if key in self and self.key: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) From 2ddf1310a7de8a40734e0090c487b9b694212679 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sat, 19 Feb 2022 08:56:15 +0100 Subject: [PATCH 7/9] Allow an attribute to be set to None before being assigning a value. --- src/oidcmsg/configure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oidcmsg/configure.py b/src/oidcmsg/configure.py index 2e766dc..9502a87 100644 --- a/src/oidcmsg/configure.py +++ b/src/oidcmsg/configure.py @@ -105,12 +105,12 @@ def __getattr__(self, item, default=None): return default def __setattr__(self, key, value): - if key in self and self.key: + if key in self and self.key is not None: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) def __setitem__(self, key, value): - if key in self: + if key in self and self.key is not None: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) From d018110bfd10ed22800287e7db9bc97dd0f26c29 Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sat, 19 Feb 2022 18:01:54 +0100 Subject: [PATCH 8/9] Don't jump to 1.6.1 . 1.6.0 is good enough. --- src/oidcmsg/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/oidcmsg/__init__.py b/src/oidcmsg/__init__.py index 9068454..ef1bd14 100644 --- a/src/oidcmsg/__init__.py +++ b/src/oidcmsg/__init__.py @@ -1,5 +1,5 @@ __author__ = "Roland Hedberg" -__version__ = "1.6.1" +__version__ = "1.6.0" import os from typing import Dict From b53c4ce570c0d32d810c94ba8c3bea3e387c203f Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Mon, 21 Feb 2022 09:25:35 +0100 Subject: [PATCH 9/9] Back to allowing other none values like "",{},[],... --- src/oidcmsg/configure.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/oidcmsg/configure.py b/src/oidcmsg/configure.py index 9502a87..d9b0c4b 100644 --- a/src/oidcmsg/configure.py +++ b/src/oidcmsg/configure.py @@ -105,12 +105,12 @@ def __getattr__(self, item, default=None): return default def __setattr__(self, key, value): - if key in self and self.key is not None: + if key in self and self.key: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value) def __setitem__(self, key, value): - if key in self and self.key is not None: + if key in self and self.key: raise KeyError('{} has already been set'.format(key)) super(Base, self).__setitem__(key, value)