Skip to content

Commit 6622e34

Browse files
author
Kevin Turner
committed
[project @ message.Message.setArg: don't add BARE_NS to namespace list.]
1 parent 264fa64 commit 6622e34

2 files changed

Lines changed: 15 additions & 5 deletions

File tree

‎openid/message.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,8 @@ def setArg(self, namespace, key, value):
368368
"""Set a single argument in this namespace"""
369369
namespace = self._fixNS(namespace)
370370
self.args[(namespace, key)] = value
371-
self.namespaces.add(namespace)
371+
if not (namespace is BARE_NS):
372+
self.namespaces.add(namespace)
372373

373374
def delArg(self, namespace, key):
374375
namespace = self._fixNS(namespace)

‎openid/test/test_message.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -392,28 +392,35 @@ def setUp(self):
392392
'openid.error':'unit test',
393393
'openid.ns':message.OPENID2_NS
394394
})
395+
self.msg.setArg(message.BARE_NS, "xey", "value")
395396

396397
def test_toPostArgs(self):
397398
self.failUnlessEqual(self.msg.toPostArgs(),
398399
{'openid.mode':'error',
399400
'openid.error':'unit test',
400401
'openid.ns':message.OPENID2_NS,
402+
'xey': 'value',
401403
})
402404

403405
def test_toArgs(self):
406+
# This method can't tolerate BARE_NS.
407+
self.msg.delArg(message.BARE_NS, "xey")
404408
self.failUnlessEqual(self.msg.toArgs(), {'mode':'error',
405409
'error':'unit test',
406410
'ns':message.OPENID2_NS,
407411
})
408412

409413
def test_toKVForm(self):
414+
# Can't tolerate BARE_NS in kvform
415+
self.msg.delArg(message.BARE_NS, "xey")
410416
self.failUnlessEqual(self.msg.toKVForm(),
411417
'error:unit test\nmode:error\nns:%s\n' %
412418
(message.OPENID2_NS,))
413419

414420
def _test_urlencoded(self, s):
415-
expected = 'openid.error=unit+test&openid.mode=error&openid.ns=%s' % (
416-
urllib.quote(message.OPENID2_NS, ''),)
421+
expected = ('openid.error=unit+test&openid.mode=error&'
422+
'openid.ns=%s&xey=value' % (
423+
urllib.quote(message.OPENID2_NS, ''),))
417424
self.failUnlessEqual(s, expected)
418425

419426

@@ -494,7 +501,8 @@ def test_getArgsOpenID(self):
494501
})
495502

496503
def test_getArgsBARE(self):
497-
self.failUnlessEqual(self.msg.getArgs(message.BARE_NS), {})
504+
self.failUnlessEqual(self.msg.getArgs(message.BARE_NS),
505+
{'xey': 'value'})
498506

499507
def test_getArgsNS1(self):
500508
self.failUnlessEqual(self.msg.getArgs(message.OPENID2_NS),
@@ -527,7 +535,8 @@ def test_updateArgsOpenID(self):
527535
before={'mode':'error', 'error':'unit test'})
528536

529537
def test_updateArgsBARE(self):
530-
self._test_updateArgsNS(message.BARE_NS)
538+
self._test_updateArgsNS(message.BARE_NS,
539+
before={'xey':'value'})
531540

532541
def test_updateArgsNS1(self):
533542
self._test_updateArgsNS(message.OPENID2_NS,

0 commit comments

Comments
 (0)