Dealt with reviewers issues.

Author: rohe

pyproject.toml

@@ -22,7 +22,7 @@ exclude_lines = [
 
 [tool.poetry]
 name = "cryptojwt"
-version = "1.4.2"
+version = "1.5.0"
 description = "Python implementation of JWT, JWE, JWS and JWK"
 authors = ["Roland Hedberg <roland@catalogix.se>"]
 license = "Apache-2.0"

src/cryptojwt/key_bundle.py

@@ -6,6 +6,7 @@
 import time
 from datetime import datetime
 from functools import cmp_to_key
+from typing import List
 from typing import Optional
 
 import requests
@@ -751,7 +752,7 @@ def difference(self, bundle):
 
         return [k for k in self._keys if k not in bundle]
 
-    def dump(self, cutoff: Optional[list] = None):
+    def dump(self, exclude_attribute: Optional[List[str]] = None):
         _keys = []
         for _k in self._keys:
             _ser = _k.to_dict()
@@ -782,6 +783,10 @@ def dump(self, cutoff: Optional[list] = None):
         if self.source:
             res["source"] = self.source
 
+        if exclude_attribute:
+            for attr in exclude_attribute:
+                del res[attr]
+
         return res
 
     def load(self, spec):

src/cryptojwt/key_issuer.py

@@ -1,6 +1,7 @@
 import json
 import logging
 import os
+from typing import List
 from typing import Optional
 
 from requests import request
@@ -351,18 +352,17 @@ def __len__(self):
             nr += len(kb)
         return nr
 
-    def dump(self, exclude=None, cutoff: Optional[list] = None) -> dict:
+    def dump(self, exclude_attribute: Optional[List[str]] = None) -> dict:
         """
         Returns the content as a dictionary.
 
-        :param exclude: Issuer that should not be include in the dump
-        :param cutoff: List of attribute name for objects that should be ignored.
+        :param exclude_attribute: List of attribute names for objects that should be ignored.
         :return: A dictionary
         """
 
         _bundles = []
         for kb in self._bundles:
-            _bundles.append(kb.dump(cutoff=cutoff))
+            _bundles.append(kb.dump(exclude_attribute=exclude_attribute))
 
         info = {
             "name": self.name,
@@ -373,6 +373,12 @@ def dump(self, exclude=None, cutoff: Optional[list] = None) -> dict:
             "remove_after": self.remove_after,
             "httpc_params": self.httpc_params,
         }
+
+        # remove after the fact
+        if exclude_attribute:
+            for attr in exclude_attribute:
+                del info[attr]
+
         return info
 
     def load(self, info):

src/cryptojwt/key_jar.py

@@ -626,12 +626,17 @@ def copy(self):
     def __len__(self):
         return len(self._issuers)
 
-    def dump(self, exclude: Optional[bool] = None, cutoff: Optional[list] = None) -> dict:
+    def dump(
+        self,
+        exclude_issuer: Optional[List[str]] = None,
+        exclude_attribute: Optional[List[str]] = None,
+    ) -> dict:
         """
         Returns the key jar content as dictionary
 
-        :param cutoff: list of attribute names that should be ignored when dumping.
-        :type cutoff: list
+        :param exclude_issuer: A list of issuers you don't want included.
+        :param exclude_attribute: list of attribute names that should be ignored when dumping.
+        :type exclude_attribute: list
         :return: A dictionary
         """
 
@@ -645,9 +650,9 @@ def dump(self, exclude: Optional[bool] = None, cutoff: Optional[list] = None) ->
 
         _issuers = {}
         for _id, _issuer in self._issuers.items():
-            if exclude and _issuer.name in exclude:
+            if exclude_issuer and _issuer.name in exclude_issuer:
                 continue
-            _issuers[_id] = _issuer.dump(cutoff=cutoff)
+            _issuers[_id] = _issuer.dump(exclude_attribute=exclude_attribute)
         info["issuers"] = _issuers
 
         return info