From e85fffa51f89f5fa20d5910dadc1ede8f9c69ac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hans=20Ho=CC=88rberg?= <hans.horberg@umu.se>
Date: Tue, 26 May 2015 10:19:17 +0200
Subject: [PATCH] Fix to use the correct Extensions element.

---
 example/idp2/idp.py              |  2 +-
 example/idp2/idp_user.py         | 16 ++++++++--------
 example/sp-wsgi/sp.py            |  2 +-
 src/saml2/s2repoze/plugins/sp.py |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/example/idp2/idp.py b/example/idp2/idp.py
index 522dff8..e4f239a 100755
--- a/example/idp2/idp.py
+++ b/example/idp2/idp.py
@@ -516,7 +516,7 @@ def do_authentication(environ, start_response, authn_context, key,
 
 PASSWD = {
     "daev0001": "qwerty",
-    "haho0032": "qwerty",
+    "testuser": "qwerty",
     "roland": "dianakra",
     "babs": "howes",
     "upper": "crust"}
diff --git a/example/idp2/idp_user.py b/example/idp2/idp_user.py
index 588f351..43cffd9 100644
--- a/example/idp2/idp_user.py
+++ b/example/idp2/idp_user.py
@@ -35,22 +35,22 @@
 #USERS = LDAPDict(**ldap_settings)
 
 USERS = {
-    "haho0032": {
-        "sn": "Hoerberg",
-        "givenName": "Hasse",
+    "testuser": {
+        "sn": "Testsson",
+        "givenName": "Test",
         "eduPersonAffiliation": "student",
         "eduPersonScopedAffiliation": "student@example.com",
-        "eduPersonPrincipalName": "haho@example.com",
-        "uid": "haho0032",
+        "eduPersonPrincipalName": "test@example.com",
+        "uid": "testuser",
         "eduPersonTargetedID": "one!for!all",
         "c": "SE",
         "o": "Example Co.",
         "ou": "IT",
         "initials": "P",
         "schacHomeOrganization": "example.com",
-        "email": "hans@example.com",
-        "displayName": "Hans Hoerberg",
-        "labeledURL": "http://www.example.com/haho My homepage",
+        "email": "test@example.com",
+        "displayName": "Test Testsson",
+        "labeledURL": "http://www.example.com/test My homepage",
         "norEduPersonNIN": "SE199012315555"
     },
     "roland": {
diff --git a/example/sp-wsgi/sp.py b/example/sp-wsgi/sp.py
index 2636889..f1d1490 100755
--- a/example/sp-wsgi/sp.py
+++ b/example/sp-wsgi/sp.py
@@ -35,7 +35,7 @@ from saml2.s_utils import UnsupportedBinding
 from saml2.s_utils import sid
 from saml2.s_utils import rndstr
 #from srtest import exception_trace
-from saml2.md import Extensions
+from saml2.samlp import Extensions
 import xmldsig as ds
 
 logger = logging.getLogger("")
diff --git a/src/saml2/s2repoze/plugins/sp.py b/src/saml2/s2repoze/plugins/sp.py
index 2088a5f..63d4f66 100644
--- a/src/saml2/s2repoze/plugins/sp.py
+++ b/src/saml2/s2repoze/plugins/sp.py
@@ -14,7 +14,7 @@ import traceback
 import saml2
 import six
 from urlparse import parse_qs, urlparse
-from saml2.md import Extensions
+from saml2.samlp import Extensions
 from saml2 import xmldsig as ds
 
 from StringIO import StringIO