@@ -141,7 +141,7 @@ def _test_success(server_url, user_url, delegate_url, links, immediate=False):
141141 mode = 'checkid_setup'
142142
143143 endpoint = OpenIDServiceEndpoint ()
144- endpoint .identity_url = user_url
144+ endpoint .claimed_id = user_url
145145 endpoint .server_url = server_url
146146 endpoint .delegate = delegate_url
147147
@@ -267,7 +267,7 @@ def setUp(self):
267267 self .consumer = self .consumer_class (self .store )
268268 self .return_to = "nonny"
269269 self .endpoint = OpenIDServiceEndpoint ()
270- self .endpoint .identity_url = self .consumer_id = "consu"
270+ self .endpoint .claimed_id = self .consumer_id = "consu"
271271 self .endpoint .server_url = self .server_url = "serlie"
272272 self .endpoint .delegate = self .server_id = "sirod"
273273
@@ -335,7 +335,7 @@ def test_cancel(self):
335335 message = Message .fromPostArgs ({'openid.mode' : 'cancel' })
336336 r = self .consumer .complete (message , self .endpoint )
337337 self .failUnlessEqual (r .status , CANCEL )
338- self .failUnless (r .identity_url == self .endpoint .identity_url )
338+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
339339
340340 def test_error (self ):
341341 msg = 'an error message'
@@ -344,7 +344,7 @@ def test_error(self):
344344 })
345345 r = self .consumer .complete (message , self .endpoint )
346346 self .failUnlessEqual (r .status , FAILURE )
347- self .failUnless (r .identity_url == self .endpoint .identity_url )
347+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
348348 self .failUnlessEqual (r .message , msg )
349349
350350 def test_errorWithNoOptionalKeys (self ):
@@ -356,7 +356,7 @@ def test_errorWithNoOptionalKeys(self):
356356 })
357357 r = self .consumer .complete (message , self .endpoint )
358358 self .failUnlessEqual (r .status , FAILURE )
359- self .failUnless (r .identity_url == self .endpoint .identity_url )
359+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
360360 self .failUnless (r .contact == contact )
361361 self .failUnless (r .reference is None )
362362 self .failUnlessEqual (r .message , msg )
@@ -371,7 +371,7 @@ def test_errorWithOptionalKeys(self):
371371 })
372372 r = self .consumer .complete (message , self .endpoint )
373373 self .failUnlessEqual (r .status , FAILURE )
374- self .failUnless (r .identity_url == self .endpoint .identity_url )
374+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
375375 self .failUnless (r .contact == contact )
376376 self .failUnless (r .reference == reference )
377377 self .failUnlessEqual (r .message , msg )
@@ -380,7 +380,7 @@ def test_noMode(self):
380380 message = Message .fromPostArgs ({})
381381 r = self .consumer .complete (message , self .endpoint )
382382 self .failUnlessEqual (r .status , FAILURE )
383- self .failUnless (r .identity_url == self .endpoint .identity_url )
383+ self .failUnless (r .identity_url == self .endpoint .claimed_id )
384384
385385 def test_idResMissingField (self ):
386386 # XXX - this test is passing, but not necessarily by what it
@@ -437,7 +437,7 @@ def tearDown(self):
437437 def test_idResMissingNoSigs (self ):
438438 def _vrfy (vid , surl ):
439439 endpoint = OpenIDServiceEndpoint ()
440- endpoint .identity_url = vid
440+ endpoint .claimed_id = vid
441441 endpoint .server_url = surl
442442 endpoint .delegate = vid
443443 return endpoint
@@ -874,15 +874,15 @@ def test_addExtensionArg(self):
874874
875875 def test_idpEndpoint (self ):
876876 self .endpoint .delegate = None
877- self .endpoint .identity_url = None
877+ self .endpoint .claimed_id = None
878878 url = self .authreq .redirectURL ('http://7.utest/' , 'http://7.utest/r' )
879879 _ , qstring = url .split ('?' )
880880 params = dict (cgi .parse_qsl (qstring ))
881881 self .failUnlessEqual (params ['openid.identity' ], IDENTIFIER_SELECT )
882882
883883 def test_idpAnonymous (self ):
884884 self .endpoint .delegate = None
885- self .endpoint .identity_url = None
885+ self .endpoint .claimed_id = None
886886 self .authreq .anonymous = True
887887 url = self .authreq .redirectURL ('http://7.utest/' , 'http://7.utest/r' )
888888 self .failUnless (url .find ('openid.identity' ) == - 1 ,
@@ -897,7 +897,7 @@ def test_userAnonymous(self):
897897class TestSuccessResponse (unittest .TestCase ):
898898 def setUp (self ):
899899 self .endpoint = OpenIDServiceEndpoint ()
900- self .endpoint .identity_url = 'identity_url'
900+ self .endpoint .claimed_id = 'identity_url'
901901
902902 def test_extensionResponse (self ):
903903 resp = mkSuccess (self .endpoint , {
@@ -1020,7 +1020,7 @@ def complete(self, message, endpoint):
10201020class ConsumerTest (unittest .TestCase ):
10211021 def setUp (self ):
10221022 self .endpoint = OpenIDServiceEndpoint ()
1023- self .endpoint .identity_url = self .identity_url = 'http://identity.url/'
1023+ self .endpoint .claimed_id = self .identity_url = 'http://identity.url/'
10241024 self .store = None
10251025 self .session = {}
10261026 self .consumer = Consumer (self .session , self .store )
@@ -1165,7 +1165,7 @@ def test_idpDrivenComplete(self):
11651165 })
11661166
11671167 endpoint = OpenIDServiceEndpoint ()
1168- endpoint .identity_url = identifier
1168+ endpoint .claimed_id = identifier
11691169 endpoint .server_url = self .endpoint .server_url
11701170 endpoint .delegate = identifier
11711171 iverified = []
@@ -1226,7 +1226,7 @@ def tearDown(self):
12261226
12271227 def test_theGoodStuff (self ):
12281228 endpoint = OpenIDServiceEndpoint ()
1229- endpoint .identity_url = self .identifier
1229+ endpoint .claimed_id = self .identifier
12301230 endpoint .server_url = self .server_url
12311231 endpoint .delegate = self .identifier
12321232 self .services = [endpoint ]
@@ -1238,7 +1238,7 @@ def test_theGoodStuff(self):
12381238 def test_otherServer (self ):
12391239 # a set of things without the stuff
12401240 endpoint = OpenIDServiceEndpoint ()
1241- endpoint .identity_url = self .identifier
1241+ endpoint .claimed_id = self .identifier
12421242 endpoint .server_url = "http://the-MOON.unittest/"
12431243 endpoint .delegate = self .identifier
12441244 self .services = [endpoint ]
@@ -1250,7 +1250,7 @@ def test_otherServer(self):
12501250 def test_foreignDelegate (self ):
12511251 # a set of things with the server stuff but other delegate
12521252 endpoint = OpenIDServiceEndpoint ()
1253- endpoint .identity_url = self .identifier
1253+ endpoint .claimed_id = self .identifier
12541254 endpoint .server_url = self .server_url
12551255 endpoint .delegate = "http://unittest/juan-carlos"
12561256 self .failUnlessRaises (DiscoveryFailure ,
0 commit comments