From f25dc0ec1d14283cba1b0160930d314a6f4b3a38 Mon Sep 17 00:00:00 2001
From: Roland Hedberg <roland.hedberg@adm.umu.se>
Date: Tue, 16 Dec 2014 11:14:44 +0100
Subject: [PATCH] Minor changes

---
 src/oic/oauth2/__init__.py | 2 +-
 src/oic/oauth2/message.py  | 3 ++-
 src/oic/utils/http_util.py | 5 ++++-
 src/oic/utils/sdb.py       | 1 -
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/oic/oauth2/__init__.py b/src/oic/oauth2/__init__.py
index b7f15b4..bebe268 100644
--- a/src/oic/oauth2/__init__.py
+++ b/src/oic/oauth2/__init__.py
@@ -554,7 +554,7 @@ class Client(PBase):
         elif token.is_valid():
             return token
         else:
-            raise ExpiredToken()
+            raise ExpiredToken("Token has expired")
 
     def construct_request(self, request, request_args=None, extra_args=None):
         if request_args is None:
diff --git a/src/oic/oauth2/message.py b/src/oic/oauth2/message.py
index 270f201..c0b1b97 100644
--- a/src/oic/oauth2/message.py
+++ b/src/oic/oauth2/message.py
@@ -117,7 +117,8 @@ class Message(object):
         if not self.lax:
             for attribute, (_, req, _ser, _, na) in _spec.items():
                 if req and attribute not in self._dict:
-                    raise MissingRequiredAttribute("%s" % attribute, self)
+                    raise MissingRequiredAttribute("%s" % attribute,
+                                                   "%s" % self)
 
         params = []
 
diff --git a/src/oic/utils/http_util.py b/src/oic/utils/http_util.py
index cb8896e..b350ffc 100644
--- a/src/oic/utils/http_util.py
+++ b/src/oic/utils/http_util.py
@@ -314,7 +314,10 @@ def get_or_post(environ):
     return data
 
 
-def extract_from_request(environ, kwargs={}):
+def extract_from_request(environ, kwargs=None):
+    if kwargs is None:
+        kwargs = {}
+
     request = None
     try:
         request = environ["QUERY_STRING"]
diff --git a/src/oic/utils/sdb.py b/src/oic/utils/sdb.py
index 44ba43e..fa06cb9 100644
--- a/src/oic/utils/sdb.py
+++ b/src/oic/utils/sdb.py
@@ -218,7 +218,6 @@ class SessionDB(object):
         Construct a sub (subject identifier)
 
         :param sid: Session identifier
-        :param uid: The local user identifier
         :param sector_id: Possible sector identifier
         :param preferred_id_type: 'public'/'pairwise'
         :return: