Skip to content

Commit 72e7129

Browse files
author
Kevin Turner
committed
[project @ Message: allow setting namespace to OpenID 1.1 namespace]
1 parent 2052924 commit 72e7129

2 files changed

Lines changed: 4 additions & 7 deletions

File tree

‎openid/message.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class Message(object):
122122
URI.
123123
"""
124124

125-
allowed_openid_namespaces = [OPENID1_NS, OPENID2_NS]
125+
allowed_openid_namespaces = [OPENID1_NS, THE_OTHER_OPENID1_NS, OPENID2_NS]
126126

127127
def __init__(self, openid_namespace=None):
128128
"""Create an empty Message.
@@ -239,9 +239,7 @@ def setOpenIDNamespace(self, openid_ns_uri=None):
239239
implicit = True
240240
else:
241241
implicit = False
242-
if openid_ns_uri == THE_OTHER_OPENID1_NS:
243-
# It's better this way, really.
244-
openid_ns_uri = OPENID1_NS
242+
245243
if openid_ns_uri not in self.allowed_openid_namespaces:
246244
raise InvalidOpenIDNamespace(openid_ns_uri)
247245

‎openid/test/test_message.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -894,18 +894,17 @@ def test_setOpenIDNamespace_invalid(self):
894894

895895

896896
def test_setOpenIDNamespace_1x(self):
897-
m = message.Message()
898897
v1_namespaces = [
899898
# Yes, there are two of them.
900899
'http://openid.net/signon/1.1',
901900
'http://openid.net/signon/1.0',
902901
]
903902

904903
for ns in v1_namespaces:
905-
m.setOpenIDNamespace(ns)
904+
m = message.Message(ns)
906905
self.failUnless(m.isOpenID1(), "%r not recognized as OpenID 1" %
907906
(ns,))
908-
907+
self.failUnlessEqual(ns, m.getOpenIDNamespace())
909908

910909
def test_setOpenIDNamespace_20(self):
911910
m = message.Message()

0 commit comments

Comments
 (0)