Skip to content

Commit dd5c44d

Browse files
author
tailor
committed
[project @ Merge yadis and urljr]
1 parent 3d98d01 commit dd5c44d

51 files changed

Lines changed: 4521 additions & 27 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎admin/runtests‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,26 @@ def pyunitTests():
5858
from openid.test import linkparse
5959
from openid.test import trustroot
6060
from openid.test import association
61+
from openid.test import test_fetchers
62+
from openid.test import test_urinorm
63+
# yadis tests
64+
from openid.test import test_parsehtml
65+
from openid.test import test_discover
66+
from openid.test import test_accept
67+
from openid.test import test_etxrd
68+
from openid.test import test_xri
69+
from openid.test import test_xrires
6170

6271
pyunit_modules = [
6372
test_server,
6473
test_consumer,
6574
test_message,
6675
test_symbol,
6776
association,
77+
test_etxrd,
78+
test_xri,
79+
test_xrires,
80+
test_discover,
6881
]
6982

7083
# Some modules have data-driven tests, and they use custom methods
@@ -77,6 +90,11 @@ def pyunitTests():
7790
test_discover,
7891
test_htmldiscover,
7992
kvform,
93+
test_parsehtml,
94+
test_discover,
95+
test_accept,
96+
test_fetchers,
97+
test_urinorm,
8098
]
8199

82100
loader = unittest.TestLoader()

‎examples/consumer.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ def quoteattr(s):
3838
from openid.consumer import consumer
3939
from openid.oidutil import appendArgs
4040
from openid.cryptutil import randomString
41-
from yadis.discover import DiscoveryFailure
42-
from urljr.fetchers import HTTPFetchingError
41+
from openid.yadis.discover import DiscoveryFailure
42+
from openid.fetchers import HTTPFetchingError
4343

4444
SREG_URI = 'http://openid.net/sreg/1.0'
4545

‎openid/consumer/consumer.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
import cgi
187187
from urlparse import urlparse
188188

189-
from urljr import fetchers
189+
from openid import fetchers
190190

191191
from openid.consumer.discover import discover as discoverURL
192192
from openid.consumer.discover import discoverXRI
@@ -198,8 +198,8 @@
198198
from openid.association import Association, default_negotiator
199199
from openid.dh import DiffieHellman
200200
from openid.store.nonce import mkNonce, split as splitNonce
201-
from yadis.manager import Discovery
202-
from yadis import xri
201+
from openid.yadis.manager import Discovery
202+
from openid.yadis import xri
203203

204204

205205
__all__ = ['AuthRequest', 'Consumer', 'SuccessResponse',

‎openid/consumer/discover.py‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,15 @@
11
# -*- test-case-name: openid.test.test_discover -*-
22

33
import urlparse
4-
from urljr import fetchers, urinorm
5-
6-
from openid import oidutil
7-
8-
# If the Yadis library is available, use it. Otherwise, only use
9-
# old-style discovery.
10-
import yadis
11-
from yadis.etxrd import nsTag, XRDSError
12-
from yadis.services import applyFilter as extractServices
13-
from yadis.discover import discover as yadisDiscover
14-
from yadis.discover import DiscoveryFailure
15-
from yadis import xrires, filters
4+
5+
from openid import oidutil, fetchers, urinorm
6+
7+
from openid import yadis
8+
from openid.yadis.etxrd import nsTag, XRDSError
9+
from openid.yadis.services import applyFilter as extractServices
10+
from openid.yadis.discover import discover as yadisDiscover
11+
from openid.yadis.discover import DiscoveryFailure
12+
from openid.yadis import xrires, filters
1613

1714
from openid.consumer.parse import openIDDiscover as parseOpenIDLinkRel
1815
from openid.consumer.parse import ParseError

0 commit comments

Comments
 (0)