Merge branch 'master' of github.com:rohe/pysaml2

Author: Roland Hedberg

src/saml2/cache.py

@@ -113,6 +113,11 @@ def set(self, name_id, entity_id, info, not_on_or_after=0):
         :param info: The session info, the assertion is part of this
         :param not_on_or_after: A time after which the assertion is not valid.
         """
+        info = dict(info)
+        if 'name_id' in info and not isinstance(info['name_id'], six.string_types):
+            # make friendly to (JSON) serialization
+            info['name_id'] = code(name_id)
+
         cni = code(name_id)
         if cni not in self._db:
             self._db[cni] = {}

src/saml2/population.py

@@ -20,15 +20,11 @@ def add_information_about_person(self, session_info):
         """If there already are information from this source in the cache
         this function will overwrite that information"""
 
+        session_info = dict(session_info)
         name_id = session_info["name_id"]
-        # make friendly to (JSON) serialization
-        #session_info['name_id'] = code(name_id)
-        name_id_coded = code(name_id)
-        issuer = session_info["issuer"]
-        del session_info["issuer"]
+        issuer = session_info.pop("issuer")
         self.cache.set(name_id, issuer, session_info,
                        session_info["not_on_or_after"])
-        session_info['name_id'] = name_id_coded
         return name_id
 
     def stale_sources_for_person(self, name_id, sources=None):