Added some extra functionality.

2 files changed, 17 insertions, 4 deletions

diff --git a/src/saml2/mdstore.py b/src/saml2/mdstore.py
index c6a51644..f7ce467e 100644
--- a/src/saml2/mdstore.py
+++ b/src/saml2/mdstore.py
@@ -130,8 +130,11 @@ class MetaData(object):
     def values(self):
         return self.entity.values()
 
+    def __len__(self):
+        return len(self.entity)
+
     def __contains__(self, item):
-        return item in self.entity
+        return item in self.entity.keys()
 
     def __getitem__(self, item):
         return self.entity[item]
@@ -139,6 +142,9 @@ class MetaData(object):
     def __setitem__(self, key, value):
         self.entity[key] = value
 
+    def __delitem__(self, key):
+        del self.entity[key]
+
     def do_entity_descriptor(self, entity_descr):
         if self.check_validity:
             try:
@@ -913,7 +919,8 @@ class MetadataStore(object):
             res = EntitiesDescriptor()
             for _md in self.metadata.values():
                 try:
-                    res.entity_descriptor.extend(_md.entities_descr.entity_descriptor)
+                    res.entity_descriptor.extend(
+                        _md.entities_descr.entity_descriptor)
                 except AttributeError:
                     res.entity_descriptor.append(_md.entity_descr)
 
diff --git a/src/saml2/sigver.py b/src/saml2/sigver.py
index a4a2bebf..2d029239 100644
--- a/src/saml2/sigver.py
+++ b/src/saml2/sigver.py
@@ -999,9 +999,15 @@ def security_context(conf, debug=None):
         return None
 
     if debug is None:
-        debug = conf.debug
+        try:
+            debug = conf.debug
+        except AttributeError:
+            pass
 
-    metadata = conf.metadata
+    try:
+        metadata = conf.metadata
+    except AttributeError:
+        metadata = None
 
     _only_md = conf.only_use_keys_in_metadata
     if _only_md is None: