From 00025554e637ad713ec2bffcc59ad806b37ea57d Mon Sep 17 00:00:00 2001 From: Roland Hedberg Date: Sun, 13 Feb 2022 21:44:58 +0100 Subject: [PATCH 1/4] 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 2/4] 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 3/4] 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 4/4] 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)