1
=== modified file 'src/api/v10/tests/test_handlers.py'
2
--- src/api/v10/tests/test_handlers.py	2018-02-09 20:56:16 +0000
3
+++ src/api/v10/tests/test_handlers.py	2018-05-30 16:21:15 +0000
4
@@ -9,8 +9,8 @@
5
9
9
6
10
from django.conf import settings
10
from django.conf import settings
7
11
from django.core import mail
11
from django.core import mail
8
12
from django.core.urlresolvers import reverse
9
13
from django.test.utils import override_settings
12
from django.test.utils import override_settings
10
13
from django.urls import reverse
11
14
from django.utils.http import urlencode
14
from django.utils.http import urlencode
12
15
from django.utils.timezone import now
15
from django.utils.timezone import now
13
16
from gargoyle.testutils import switches
16
from gargoyle.testutils import switches
14
17
17
15
=== modified file 'src/api/v20/tests/test_auth.py'
16
--- src/api/v20/tests/test_auth.py	2018-02-09 20:56:16 +0000
17
+++ src/api/v20/tests/test_auth.py	2018-05-30 16:21:15 +0000
18
@@ -5,8 +5,8 @@
19
5
import json
5
import json
20
6
from urllib import urlencode
6
from urllib import urlencode
21
7
7
22
8
from django.core.urlresolvers import reverse
23
9
from django.test.client import RequestFactory
8
from django.test.client import RequestFactory
24
9
from django.urls import reverse
25
10
from piston.handler import AnonymousBaseHandler
10
from piston.handler import AnonymousBaseHandler
26
11
from piston.resource import Resource
11
from piston.resource import Resource
27
12
12
28
13
13
29
=== modified file 'src/api/v20/tests/test_decorators.py'
30
--- src/api/v20/tests/test_decorators.py	2018-02-14 14:05:59 +0000
31
+++ src/api/v20/tests/test_decorators.py	2018-05-30 16:21:15 +0000
32
@@ -4,8 +4,8 @@
33
4
4
34
5
from django.conf.urls import url
5
from django.conf.urls import url
35
6
from django.core.cache import cache
6
from django.core.cache import cache
36
7
from django.core.urlresolvers import reverse
37
8
from django.test import override_settings
7
from django.test import override_settings
38
8
from django.urls import reverse
39
9
from memcache import Client
9
from memcache import Client
40
10
from piston.handler import BaseHandler
10
from piston.handler import BaseHandler
41
11
from piston.resource import Resource
11
from piston.resource import Resource
42
12
12
43
=== modified file 'src/api/v20/tests/test_handlers.py'
44
--- src/api/v20/tests/test_handlers.py	2018-02-14 14:05:59 +0000
45
+++ src/api/v20/tests/test_handlers.py	2018-05-30 16:21:15 +0000
46
@@ -16,9 +16,10 @@
47
16
from django.contrib.auth.models import AnonymousUser
16
from django.contrib.auth.models import AnonymousUser
48
17
from django.core import mail
17
from django.core import mail
49
18
from django.core.serializers.json import DjangoJSONEncoder
18
from django.core.serializers.json import DjangoJSONEncoder
50
19
from django.core.urlresolvers import NoReverseMatch, reverse
51
20
from django.test.client import RequestFactory
19
from django.test.client import RequestFactory
52
21
from django.test.utils import override_settings
20
from django.test.utils import override_settings
53
21
from django.urls import reverse
54
22
from django.urls.exceptions import NoReverseMatch
55
22
from django.utils.timezone import now
23
from django.utils.timezone import now
56
23
from gargoyle.testutils import switches
24
from gargoyle.testutils import switches
57
24
from mock import Mock, patch
25
from mock import Mock, patch
58
25
26
59
=== modified file 'src/api/v20/tests/test_login.py'
60
--- src/api/v20/tests/test_login.py	2018-02-21 11:59:00 +0000
61
+++ src/api/v20/tests/test_login.py	2018-05-30 16:21:15 +0000
62
@@ -2,7 +2,7 @@
63
2
2
64
3
from django.contrib.auth.hashers import make_password
3
from django.contrib.auth.hashers import make_password
65
4
from django.core.serializers.json import DjangoJSONEncoder
4
from django.core.serializers.json import DjangoJSONEncoder
67
5
from django.core.urlresolvers import reverse
5
from django.urls import reverse
68
6
from django.utils.timezone import now
6
from django.utils.timezone import now
69
7
from timeline import Timeline
7
from timeline import Timeline
70
8
8
71
9
9
72
=== modified file 'src/api/v20/tests/test_urls.py'
73
--- src/api/v20/tests/test_urls.py	2016-06-08 05:03:11 +0000
74
+++ src/api/v20/tests/test_urls.py	2018-05-30 16:21:15 +0000
75
@@ -1,4 +1,5 @@
77
1
from django.core.urlresolvers import resolve, reverse
1
from django.urls import reverse
78
2
from django.urls.base import resolve
79
2
from piston.authentication import NoAuthentication
3
from piston.authentication import NoAuthentication
80
3
4
81
4
from api.v20 import auth, handlers
5
from api.v20 import auth, handlers
82
5
6
83
=== modified file 'src/api/v20/tests/test_utils.py'
84
--- src/api/v20/tests/test_utils.py	2018-01-27 13:11:38 +0000
85
+++ src/api/v20/tests/test_utils.py	2018-05-30 16:21:15 +0000
86
@@ -3,7 +3,7 @@
87
3
from functools import partial
3
from functools import partial
88
4
from operator import attrgetter
4
from operator import attrgetter
89
5
5
91
6
from django.core.urlresolvers import reverse
6
from django.urls import reverse
92
7
7
93
8
from api.v20.utils import (
8
from api.v20.utils import (
94
9
    EnsureJSONResponseOnAPIErrorMiddleware,
9
    EnsureJSONResponseOnAPIErrorMiddleware,
95
10
10
96
=== modified file 'src/api/v20/utils.py'
97
--- src/api/v20/utils.py	2018-02-09 14:17:25 +0000
98
+++ src/api/v20/utils.py	2018-05-30 16:21:15 +0000
99
@@ -4,8 +4,8 @@
100
4
import json
4
import json
101
5
from operator import attrgetter
5
from operator import attrgetter
102
6
6
103
7
from django.core.urlresolvers import reverse
104
8
from django.http import HttpResponse
7
from django.http import HttpResponse
105
8
from django.urls import reverse
106
9
from django.utils.translation import ugettext_lazy as _
9
from django.utils.translation import ugettext_lazy as _
107
10
10
108
11
from identityprovider.models.account import Account
11
from identityprovider.models.account import Account
109
12
12
110
=== modified file 'src/identityprovider/admin.py'
111
--- src/identityprovider/admin.py	2018-05-29 17:14:24 +0000
112
+++ src/identityprovider/admin.py	2018-05-30 16:21:15 +0000
113
@@ -14,10 +14,10 @@
114
14
from django.contrib.auth.hashers import make_password
14
from django.contrib.auth.hashers import make_password
115
15
from django.contrib.auth.models import User
15
from django.contrib.auth.models import User
116
16
from django.core import validators
16
from django.core import validators
117
17
from django.core.urlresolvers import reverse
118
18
from django.db import connections
17
from django.db import connections
119
19
from django.db.models.query import QuerySet
18
from django.db.models.query import QuerySet
120
20
from django.template.defaultfilters import force_escape
19
from django.template.defaultfilters import force_escape
121
20
from django.urls import reverse
122
21
from django.utils.html import format_html
21
from django.utils.html import format_html
123
22
from oauth_backend.models import Consumer as V1Consumer, Token as V1Token
22
from oauth_backend.models import Consumer as V1Consumer, Token as V1Token
124
23
23
125
24
24
126
=== modified file 'src/identityprovider/emailutils.py'
127
--- src/identityprovider/emailutils.py	2018-04-04 15:35:18 +0000
128
+++ src/identityprovider/emailutils.py	2018-05-30 16:21:15 +0000
129
@@ -6,8 +6,8 @@
130
6
6
131
7
from django.conf import settings
7
from django.conf import settings
132
8
from django.core.mail import send_mail
8
from django.core.mail import send_mail
133
9
from django.core.urlresolvers import reverse
134
10
from django.template.loader import render_to_string
9
from django.template.loader import render_to_string
135
10
from django.urls import reverse
136
11
from django.utils.timezone import now
11
from django.utils.timezone import now
137
12
from django.utils.translation import ugettext_lazy as _
12
from django.utils.translation import ugettext_lazy as _
138
13
13
139
14
14
140
=== modified file 'src/identityprovider/forms.py'
141
--- src/identityprovider/forms.py	2018-05-25 21:47:30 +0000
142
+++ src/identityprovider/forms.py	2018-05-30 16:21:15 +0000
143
@@ -6,8 +6,8 @@
144
6
6
145
7
from django import forms
7
from django import forms
146
8
from django.conf import settings
8
from django.conf import settings
147
9
from django.core.urlresolvers import reverse
148
10
from django.forms import Form, fields, widgets
9
from django.forms import Form, fields, widgets
149
10
from django.urls import reverse
150
11
from django.utils import translation
11
from django.utils import translation
151
12
from django.utils.translation import ugettext_lazy as _
12
from django.utils.translation import ugettext_lazy as _
152
13
from gargoyle import gargoyle
13
from gargoyle import gargoyle
153
14
14
154
=== modified file 'src/identityprovider/middleware/useraccount.py'
155
--- src/identityprovider/middleware/useraccount.py	2016-06-08 17:05:05 +0000
156
+++ src/identityprovider/middleware/useraccount.py	2018-05-30 16:21:15 +0000
157
@@ -41,7 +41,7 @@
158
41
                logout(request)
41
                logout(request)
159
42
42
160
43
    def process_request(self, request):
43
    def process_request(self, request):
162
44
        if request.user.is_authenticated():
44
        if request.user.is_authenticated:
163
45
            is_admin_url = self.is_admin_area(request.get_full_path())
45
            is_admin_url = self.is_admin_area(request.get_full_path())
164
46
            if isinstance(request.user, User) and not is_admin_url:
46
            if isinstance(request.user, User) and not is_admin_url:
165
47
                try:
47
                try:
166
48
48
167
=== modified file 'src/identityprovider/middleware/xrds.py'
168
--- src/identityprovider/middleware/xrds.py	2018-02-09 20:56:16 +0000
169
+++ src/identityprovider/middleware/xrds.py	2018-05-30 16:21:15 +0000
170
@@ -3,10 +3,11 @@
171
3
3
172
4
from urlparse import urlparse
4
from urlparse import urlparse
173
5
5
174
6
from django.core.urlresolvers import resolve, reverse
175
7
from django.http import Http404, HttpResponse
6
from django.http import Http404, HttpResponse
176
8
from django.shortcuts import get_object_or_404
7
from django.shortcuts import get_object_or_404
177
9
from django.template.loader import render_to_string
8
from django.template.loader import render_to_string
178
9
from django.urls import reverse
179
10
from django.urls.base import resolve
180
10
11
181
11
from openid.yadis.accept import getAcceptable
12
from openid.yadis.accept import getAcceptable
182
12
from openid.yadis.constants import YADIS_CONTENT_TYPE, YADIS_HEADER_NAME
13
from openid.yadis.constants import YADIS_CONTENT_TYPE, YADIS_HEADER_NAME
183
13
14
184
=== modified file 'src/identityprovider/models/authtoken.py'
185
--- src/identityprovider/models/authtoken.py	2018-05-25 16:27:25 +0000
186
+++ src/identityprovider/models/authtoken.py	2018-05-30 16:21:15 +0000
187
@@ -8,10 +8,10 @@
188
8
8
189
9
from hashlib import sha256
9
from hashlib import sha256
190
10
10
191
11
from django.core.urlresolvers import reverse
192
12
from django.core.validators import validate_email
11
from django.core.validators import validate_email
193
13
from django.db import models
12
from django.db import models
194
14
from django.http import Http404
13
from django.http import Http404
195
14
from django.urls import reverse
196
15
from django.utils.timezone import now
15
from django.utils.timezone import now
197
16
16
198
17
from identityprovider.models.account import (
17
from identityprovider.models.account import (
199
18
18
200
=== modified file 'src/identityprovider/tests/helpers.py'
201
--- src/identityprovider/tests/helpers.py	2018-02-20 17:13:36 +0000
202
+++ src/identityprovider/tests/helpers.py	2018-05-30 16:21:15 +0000
203
@@ -7,7 +7,7 @@
204
7
7
205
8
from django.contrib.auth.models import User
8
from django.contrib.auth.models import User
206
9
from django.core import mail
9
from django.core import mail
208
10
from django.core.urlresolvers import reverse
10
from django.urls import reverse
209
11
from openid import fetchers
11
from openid import fetchers
210
12
from openid.consumer.consumer import Consumer
12
from openid.consumer.consumer import Consumer
211
13
from openid.consumer.discover import (
13
from openid.consumer.discover import (
212
14
14
213
=== modified file 'src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py'
214
--- src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py	2013-11-12 15:30:36 +0000
215
+++ src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py	2018-05-30 16:21:15 +0000
216
@@ -1,4 +1,4 @@
218
1
from django.core.urlresolvers import reverse
1
from django.urls import reverse
219
2
2
220
3
from identityprovider.tests.helpers import OpenIDTestCase
3
from identityprovider.tests.helpers import OpenIDTestCase
221
4
4
222
5
5
223
=== modified file 'src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py'
224
--- src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py	2013-04-01 15:24:48 +0000
225
+++ src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py	2018-05-30 16:21:15 +0000
226
@@ -1,4 +1,4 @@
228
1
from django.core.urlresolvers import reverse
1
from django.urls import reverse
229
2
2
230
3
from identityprovider.models import OpenIDRPSummary
3
from identityprovider.models import OpenIDRPSummary
231
4
from identityprovider.tests.helpers import OpenIDTestCase
4
from identityprovider.tests.helpers import OpenIDTestCase
232
5
5
233
=== modified file 'src/identityprovider/tests/sso_server/test_standalone_login.py'
234
--- src/identityprovider/tests/sso_server/test_standalone_login.py	2018-02-09 20:56:16 +0000
235
+++ src/identityprovider/tests/sso_server/test_standalone_login.py	2018-05-30 16:21:15 +0000
236
@@ -1,4 +1,4 @@
238
1
from django.core.urlresolvers import reverse
1
from django.urls import reverse
239
2
2
240
3
from identityprovider.models.account import Account
3
from identityprovider.models.account import Account
241
4
from identityprovider.tests import DEFAULT_USER_PASSWORD
4
from identityprovider.tests import DEFAULT_USER_PASSWORD
242
5
5
243
=== modified file 'src/identityprovider/tests/test_admin.py'
244
--- src/identityprovider/tests/test_admin.py	2018-05-29 17:14:24 +0000
245
+++ src/identityprovider/tests/test_admin.py	2018-05-30 16:21:15 +0000
246
@@ -14,8 +14,8 @@
247
14
)
14
)
248
15
from django.contrib.auth.hashers import check_password
15
from django.contrib.auth.hashers import check_password
249
16
from django.contrib.auth.models import User
16
from django.contrib.auth.models import User
250
17
from django.core.urlresolvers import reverse
251
18
from django.db import connections
17
from django.db import connections
252
18
from django.urls import reverse
253
19
from django.utils.dateformat import format
19
from django.utils.dateformat import format
254
20
from django.utils.timezone import now
20
from django.utils.timezone import now
255
21
from mock import MagicMock, Mock, patch
21
from mock import MagicMock, Mock, patch
256
22
22
257
=== modified file 'src/identityprovider/tests/test_emailutils.py'
258
--- src/identityprovider/tests/test_emailutils.py	2017-05-09 18:02:49 +0000
259
+++ src/identityprovider/tests/test_emailutils.py	2018-05-30 16:21:15 +0000
260
@@ -8,9 +8,9 @@
261
8
8
262
9
from django.conf import settings
9
from django.conf import settings
263
10
from django.core import mail
10
from django.core import mail
264
11
from django.core.urlresolvers import reverse
265
12
from django.template.loader import render_to_string
11
from django.template.loader import render_to_string
266
13
from django.test.utils import override_settings
12
from django.test.utils import override_settings
267
13
from django.urls import reverse
268
14
from django.utils.timezone import now
14
from django.utils.timezone import now
269
15
from mock import patch
15
from mock import patch
270
16
16
271
17
17
272
=== modified file 'src/identityprovider/tests/test_models_authtoken.py'
273
--- src/identityprovider/tests/test_models_authtoken.py	2018-02-09 20:56:16 +0000
274
+++ src/identityprovider/tests/test_models_authtoken.py	2018-05-30 16:21:15 +0000
275
@@ -6,9 +6,9 @@
276
6
6
277
7
from django.conf import settings
7
from django.conf import settings
278
8
from django.core.exceptions import MultipleObjectsReturned, ValidationError
8
from django.core.exceptions import MultipleObjectsReturned, ValidationError
279
9
from django.core.urlresolvers import reverse
280
10
from django.http import Http404
9
from django.http import Http404
281
11
from django.test.utils import override_settings
10
from django.test.utils import override_settings
282
11
from django.urls import reverse
283
12
from django.utils.timezone import now
12
from django.utils.timezone import now
284
13
from mock import patch
13
from mock import patch
285
14
14
286
15
15
287
=== modified file 'src/identityprovider/tests/test_readonly.py'
288
--- src/identityprovider/tests/test_readonly.py	2018-02-09 20:56:16 +0000
289
+++ src/identityprovider/tests/test_readonly.py	2018-05-30 16:21:15 +0000
290
@@ -10,7 +10,7 @@
291
10
import requests
10
import requests
292
11
import responses
11
import responses
293
12
from django.conf import settings
12
from django.conf import settings
295
13
from django.core.urlresolvers import reverse
13
from django.urls import reverse
296
14
14
297
15
from identityprovider.readonly import (
15
from identityprovider.readonly import (
298
16
    ReadOnlyManager,
16
    ReadOnlyManager,
299
17
17
300
=== modified file 'src/identityprovider/tests/test_signals.py'
301
--- src/identityprovider/tests/test_signals.py	2018-01-23 17:51:11 +0000
302
+++ src/identityprovider/tests/test_signals.py	2018-05-30 16:21:15 +0000
303
@@ -5,11 +5,11 @@
304
5
5
305
6
from django.conf import settings
6
from django.conf import settings
306
7
from django.contrib.auth.signals import user_logged_in
7
from django.contrib.auth.signals import user_logged_in
307
8
from django.core.urlresolvers import reverse
308
9
from django.db.models.signals import (
8
from django.db.models.signals import (
309
10
    post_save,
9
    post_save,
310
11
    pre_delete,
10
    pre_delete,
311
12
)
11
)
312
12
from django.urls import reverse
313
13
from django.utils.timezone import now
13
from django.utils.timezone import now
314
14
14
315
15
from mock import Mock, patch
15
from mock import Mock, patch
316
16
16
317
=== modified file 'src/identityprovider/tests/test_views_server.py'
318
--- src/identityprovider/tests/test_views_server.py	2018-02-20 17:12:17 +0000
319
+++ src/identityprovider/tests/test_views_server.py	2018-05-30 16:21:15 +0000
320
@@ -12,9 +12,9 @@
321
12
from django.contrib import messages
12
from django.contrib import messages
322
13
from django.contrib.auth.models import AnonymousUser
13
from django.contrib.auth.models import AnonymousUser
323
14
from django.core.cache import cache
14
from django.core.cache import cache
324
15
from django.core.urlresolvers import reverse
325
16
from django.http import HttpRequest
15
from django.http import HttpRequest
326
17
from django.test.utils import override_settings, patch_logger
16
from django.test.utils import override_settings, patch_logger
327
17
from django.urls import reverse
328
18
from django.utils.timezone import now
18
from django.utils.timezone import now
329
19
from gargoyle.testutils import switches
19
from gargoyle.testutils import switches
330
20
from mock import Mock
20
from mock import Mock
331
21
21
332
=== modified file 'src/identityprovider/tests/test_views_testing.py'
333
--- src/identityprovider/tests/test_views_testing.py	2018-02-09 20:56:16 +0000
334
+++ src/identityprovider/tests/test_views_testing.py	2018-05-30 16:21:15 +0000
335
@@ -2,8 +2,8 @@
336
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
337
3
3
338
4
from django.conf import settings
4
from django.conf import settings
339
5
from django.core.urlresolvers import reverse
340
6
from django.test.utils import patch_logger
5
from django.test.utils import patch_logger
341
6
from django.urls import reverse
342
7
7
343
8
from identityprovider.tests.utils import SSOBaseTestCase
8
from identityprovider.tests.utils import SSOBaseTestCase
344
9
from identityprovider.views.testing import (
9
from identityprovider.views.testing import (
345
10
10
346
=== modified file 'src/identityprovider/tests/test_xrds.py'
347
--- src/identityprovider/tests/test_xrds.py	2018-02-09 20:56:16 +0000
348
+++ src/identityprovider/tests/test_xrds.py	2018-05-30 16:21:15 +0000
349
@@ -1,8 +1,8 @@
350
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
1
# Copyright 2010 Canonical Ltd.  This software is licensed under the
351
2
# GNU Affero General Public License version 3 (see the file LICENSE).
2
# GNU Affero General Public License version 3 (see the file LICENSE).
352
3
3
353
4
from django.core.urlresolvers import reverse
354
5
from django.test.utils import override_settings, patch_logger
4
from django.test.utils import override_settings, patch_logger
355
5
from django.urls import reverse
356
6
6
357
7
from identityprovider.tests.utils import SSOBaseTestCase
7
from identityprovider.tests.utils import SSOBaseTestCase
358
8
8
359
9
9
360
=== modified file 'src/identityprovider/utils.py'
361
--- src/identityprovider/utils.py	2018-01-27 13:11:38 +0000
362
+++ src/identityprovider/utils.py	2018-05-30 16:21:15 +0000
363
@@ -15,9 +15,9 @@
364
15
from django.conf import settings
15
from django.conf import settings
365
16
from django.contrib.sessions.models import Session
16
from django.contrib.sessions.models import Session
366
17
from django.core.exceptions import ObjectDoesNotExist
17
from django.core.exceptions import ObjectDoesNotExist
367
18
from django.core.urlresolvers import reverse
368
19
from django.db import connection, transaction
18
from django.db import connection, transaction
369
20
from django.db.utils import ProgrammingError
19
from django.db.utils import ProgrammingError
370
20
from django.urls import reverse
371
21
from django.utils.translation import ugettext_lazy as _
21
from django.utils.translation import ugettext_lazy as _
372
22
22
373
23
SALT_LENGTH = 20
23
SALT_LENGTH = 20
374
24
24
375
=== modified file 'src/identityprovider/views/server.py'
376
--- src/identityprovider/views/server.py	2018-05-25 20:41:26 +0000
377
+++ src/identityprovider/views/server.py	2018-05-30 16:21:15 +0000
378
@@ -10,7 +10,6 @@
379
10
10
380
11
from django.conf import settings
11
from django.conf import settings
381
12
from django.contrib import auth, messages
12
from django.contrib import auth, messages
382
13
from django.core.urlresolvers import reverse
383
14
from django.http import (
13
from django.http import (
384
15
    Http404,
14
    Http404,
385
16
    HttpResponse,
15
    HttpResponse,
386
@@ -20,6 +19,7 @@
387
20
)
19
)
388
21
from django.shortcuts import get_object_or_404, render
20
from django.shortcuts import get_object_or_404, render
389
22
from django.template import loader
21
from django.template import loader
390
22
from django.urls import reverse
391
23
from django.utils import translation
23
from django.utils import translation
392
24
from django.utils.decorators import decorator_from_middleware
24
from django.utils.decorators import decorator_from_middleware
393
25
from django.utils.timezone import now
25
from django.utils.timezone import now
394
26
26
395
=== modified file 'src/identityprovider/widgets.py'
396
--- src/identityprovider/widgets.py	2018-05-28 17:05:47 +0000
397
+++ src/identityprovider/widgets.py	2018-05-30 16:21:15 +0000
398
@@ -30,15 +30,16 @@
399
30
30
400
31
31
401
32
class ROAwareTextInput(TextInput):
32
class ROAwareTextInput(TextInput):
403
33
    def render(self, name, value, attrs=None):
33
    def render(self, name, value, attrs=None, renderer=None):
404
34
        if settings.READ_ONLY_MODE:
34
        if settings.READ_ONLY_MODE:
405
35
            return read_only_markup(value)
35
            return read_only_markup(value)
406
36
        else:
36
        else:
408
37
            return super(ROAwareTextInput, self).render(name, value, attrs)
37
            return super(ROAwareTextInput, self).render(
409
38
                name, value, attrs, renderer)
410
38
39
411
39
40
412
40
class ROAwareSelect(Select):
41
class ROAwareSelect(Select):
414
41
    def render(self, name, value, attrs=None):
42
    def render(self, name, value, attrs=None, renderer=None):
415
42
        if settings.READ_ONLY_MODE:
43
        if settings.READ_ONLY_MODE:
416
43
            label = ''
44
            label = ''
417
44
            for option_value, option_label in self.choices:
45
            for option_value, option_label in self.choices:
418
@@ -47,11 +48,12 @@
419
47
                    break
48
                    break
420
48
            return read_only_markup(label)
49
            return read_only_markup(label)
421
49
        else:
50
        else:
423
50
            return super(ROAwareSelect, self).render(name, value, attrs)
51
            return super(ROAwareSelect, self).render(
424
52
                name, value, attrs, renderer)
425
51
53
426
52
54
427
53
class CommaSeparatedWidget(CheckboxSelectMultiple):
55
class CommaSeparatedWidget(CheckboxSelectMultiple):
429
54
    def render(self, name, value, attrs=None):
56
    def render(self, name, value, attrs=None, renderer=None):
430
55
        if value is None:
57
        if value is None:
431
56
            value = ''
58
            value = ''
432
57
        if isinstance(value, list):
59
        if isinstance(value, list):
433
@@ -59,14 +61,14 @@
434
59
        else:
61
        else:
435
60
            vals = value.split(',')
62
            vals = value.split(',')
436
61
        return super(CommaSeparatedWidget, self).render(
63
        return super(CommaSeparatedWidget, self).render(
438
62
            name, vals, attrs)
64
            name, vals, attrs, renderer)
439
63
65
440
64
66
441
65
class StatusWidget(Select):
67
class StatusWidget(Select):
442
66
    date_status_set = None
68
    date_status_set = None
443
67
69
446
68
    def render(self, name, value, attrs=None):
70
    def render(self, name, value, attrs=None, renderer=None):
447
69
        select = super(StatusWidget, self).render(name, value, attrs)
71
        select = super(StatusWidget, self).render(name, value, attrs, renderer)
448
70
        if self.date_status_set:
72
        if self.date_status_set:
449
71
            status_date = _("Set on %s") % self.date_status_set
73
            status_date = _("Set on %s") % self.date_status_set
450
72
        else:
74
        else:
451
@@ -77,12 +79,12 @@
452
77
class ReadOnlyDateTimeWidget(Widget):
79
class ReadOnlyDateTimeWidget(Widget):
453
78
    value = None
80
    value = None
454
79
81
456
80
    def render(self, name, value, attrs=None):
82
    def render(self, name, value, attrs=None, renderer=None):
457
81
        return str(self.value)
83
        return str(self.value)
458
82
84
459
83
85
460
84
class LPUsernameWidget(Widget):
86
class LPUsernameWidget(Widget):
461
85
    account = None
87
    account = None
462
86
88
464
87
    def render(self, name, value, attrs=None):
89
    def render(self, name, value, attrs=None, renderer=None):
465
88
        return mark_safe_lazy(account_to_lp_link(self.account))
90
        return mark_safe_lazy(account_to_lp_link(self.account))
466
89
91
467
=== modified file 'src/ubuntu_sso_saml/tests/test_processors.py'
468
--- src/ubuntu_sso_saml/tests/test_processors.py	2018-04-16 16:32:22 +0000
469
+++ src/ubuntu_sso_saml/tests/test_processors.py	2018-05-30 16:21:15 +0000
470
@@ -10,9 +10,9 @@
471
10
from StringIO import StringIO
10
from StringIO import StringIO
472
11
from xml.dom import minidom
11
from xml.dom import minidom
473
12
12
474
13
from django.core.urlresolvers import reverse
475
14
from django.test.client import Client
13
from django.test.client import Client
476
15
from django.test.utils import override_settings
14
from django.test.utils import override_settings
477
15
from django.urls import reverse
478
16
from gargoyle.models import GLOBAL, Switch
16
from gargoyle.models import GLOBAL, Switch
479
17
from gargoyle.testutils import switches
17
from gargoyle.testutils import switches
480
18
from lxml import etree
18
from lxml import etree
481
19
19
482
=== modified file 'src/ubuntu_sso_saml/tests/test_views.py'
483
--- src/ubuntu_sso_saml/tests/test_views.py	2018-04-04 14:49:47 +0000
484
+++ src/ubuntu_sso_saml/tests/test_views.py	2018-05-30 16:21:15 +0000
485
@@ -1,6 +1,6 @@
486
1
import copy
1
import copy
487
2
2
489
3
from django.core.urlresolvers import reverse
3
from django.urls import reverse
490
4
from saml2idp import saml2idp_metadata
4
from saml2idp import saml2idp_metadata
491
5
5
492
6
from identityprovider.tests.utils import SSOBaseTestCase
6
from identityprovider.tests.utils import SSOBaseTestCase
493
7
7
494
=== modified file 'src/ubuntu_sso_saml/views.py'
495
--- src/ubuntu_sso_saml/views.py	2018-04-04 14:49:47 +0000
496
+++ src/ubuntu_sso_saml/views.py	2018-05-30 16:21:15 +0000
497
@@ -3,8 +3,8 @@
498
3
import logging
3
import logging
499
4
from urlparse import urlparse, urlunparse
4
from urlparse import urlparse, urlunparse
500
5
5
501
6
from django.core.urlresolvers import reverse
502
7
from django.shortcuts import get_object_or_404, redirect, render
6
from django.shortcuts import get_object_or_404, redirect, render
503
7
from django.urls import reverse
504
8
from django.utils.datastructures import MultiValueDictKeyError
8
from django.utils.datastructures import MultiValueDictKeyError
505
9
from django.views.decorators.csrf import csrf_exempt
9
from django.views.decorators.csrf import csrf_exempt
506
10
from saml2idp import registry, saml2idp_metadata, xml_signing
10
from saml2idp import registry, saml2idp_metadata, xml_signing
507
11
11
508
=== modified file 'src/webui/decorators.py'
509
--- src/webui/decorators.py	2018-05-25 20:41:26 +0000
510
+++ src/webui/decorators.py	2018-05-30 16:21:15 +0000
511
@@ -16,7 +16,6 @@
512
16
)
16
)
513
17
from django.contrib.auth.views import redirect_to_login
17
from django.contrib.auth.views import redirect_to_login
514
18
from django.core.cache import cache
18
from django.core.cache import cache
515
19
from django.core.urlresolvers import reverse
516
20
from django.http import (
19
from django.http import (
517
21
    Http404,
20
    Http404,
518
22
    HttpResponseForbidden,
21
    HttpResponseForbidden,
519
@@ -24,6 +23,7 @@
520
24
)
23
)
521
25
from django.template.loader import render_to_string
24
from django.template.loader import render_to_string
522
26
from django.template.response import TemplateResponse
25
from django.template.response import TemplateResponse
523
26
from django.urls import reverse
524
27
from django.utils.decorators import available_attrs
27
from django.utils.decorators import available_attrs
525
28
from django.utils.http import (
28
from django.utils.http import (
526
29
    urlencode,
29
    urlencode,
527
30
30
528
=== modified file 'src/webui/tests/test_decorators.py'
529
--- src/webui/tests/test_decorators.py	2017-10-04 19:52:55 +0000
530
+++ src/webui/tests/test_decorators.py	2018-05-30 16:21:15 +0000
531
@@ -4,11 +4,11 @@
532
4
4
533
5
from django.conf import settings
5
from django.conf import settings
534
6
from django.contrib.auth.models import AnonymousUser
6
from django.contrib.auth.models import AnonymousUser
535
7
from django.core.urlresolvers import reverse
536
8
from django.http import (
7
from django.http import (
537
9
    Http404,
8
    Http404,
538
10
    HttpResponseRedirect,
9
    HttpResponseRedirect,
539
11
)
10
)
540
11
from django.urls import reverse
541
12
from django.utils.timezone import now
12
from django.utils.timezone import now
542
13
from gargoyle.testutils import switches
13
from gargoyle.testutils import switches
543
14
14
544
@@ -354,7 +354,7 @@
545
354
        self.assertEqual(self.calls, [])
354
        self.assertEqual(self.calls, [])
546
355
        # user was logged out
355
        # user was logged out
547
356
        self.assertIsInstance(self.request.user, AnonymousUser)
356
        self.assertIsInstance(self.request.user, AnonymousUser)
549
357
        self.assertFalse(self.request.user.is_authenticated())
357
        self.assertFalse(self.request.user.is_authenticated)
550
358
358
551
359
359
552
360
class SSOLoginRequiredNoEmailsTestCase(
360
class SSOLoginRequiredNoEmailsTestCase(
553
361
361
554
=== modified file 'src/webui/tests/test_templates.py'
555
--- src/webui/tests/test_templates.py	2017-05-22 21:18:47 +0000
556
+++ src/webui/tests/test_templates.py	2018-05-30 16:21:15 +0000
557
@@ -1,7 +1,7 @@
558
1
from __future__ import unicode_literals
1
from __future__ import unicode_literals
559
2
2
560
3
from django.core.urlresolvers import reverse
561
4
from django.template.loader import render_to_string
3
from django.template.loader import render_to_string
562
4
from django.urls import reverse
563
5
from mock import patch
5
from mock import patch
564
6
from pyquery import PyQuery
6
from pyquery import PyQuery
565
7
7
566
8
8
567
=== modified file 'src/webui/tests/test_views_account.py'
568
--- src/webui/tests/test_views_account.py	2018-05-09 20:50:02 +0000
569
+++ src/webui/tests/test_views_account.py	2018-05-30 16:21:15 +0000
570
@@ -13,8 +13,9 @@
571
13
from django.conf import settings
13
from django.conf import settings
572
14
from django.contrib.auth.hashers import check_password
14
from django.contrib.auth.hashers import check_password
573
15
from django.core import mail
15
from django.core import mail
574
16
from django.core.urlresolvers import NoReverseMatch, reverse
575
17
from django.test.utils import override_settings
16
from django.test.utils import override_settings
576
17
from django.urls import reverse
577
18
from django.urls.exceptions import NoReverseMatch
578
18
from gargoyle.testutils import switches
19
from gargoyle.testutils import switches
579
19
from pyquery import PyQuery
20
from pyquery import PyQuery
580
20
21
581
21
22
582
=== modified file 'src/webui/tests/test_views_account_ssh.py'
583
--- src/webui/tests/test_views_account_ssh.py	2018-02-08 15:12:52 +0000
584
+++ src/webui/tests/test_views_account_ssh.py	2018-05-30 16:21:15 +0000
585
@@ -3,7 +3,7 @@
586
3
3
587
4
from __future__ import unicode_literals
4
from __future__ import unicode_literals
588
5
5
590
6
from django.core.urlresolvers import reverse
6
from django.urls import reverse
591
7
from gargoyle.testutils import switches
7
from gargoyle.testutils import switches
592
8
from mock import call
8
from mock import call
593
9
9
594
10
10
595
=== modified file 'src/webui/tests/test_views_auth_log.py'
596
--- src/webui/tests/test_views_auth_log.py	2018-02-09 20:56:16 +0000
597
+++ src/webui/tests/test_views_auth_log.py	2018-05-30 16:21:15 +0000
598
@@ -5,7 +5,7 @@
599
5
from __future__ import unicode_literals
5
from __future__ import unicode_literals
600
6
6
601
7
from django.conf import settings
7
from django.conf import settings
603
8
from django.core.urlresolvers import reverse
8
from django.urls import reverse
604
9
from django.utils.timezone import now, timedelta
9
from django.utils.timezone import now, timedelta
605
10
10
606
11
from identityprovider.models.const import AuthLogType
11
from identityprovider.models.const import AuthLogType
607
12
12
608
=== modified file 'src/webui/tests/test_views_consumer.py'
609
--- src/webui/tests/test_views_consumer.py	2018-02-09 20:56:16 +0000
610
+++ src/webui/tests/test_views_consumer.py	2018-05-30 16:21:15 +0000
611
@@ -6,8 +6,8 @@
612
6
6
613
7
from urllib import quote_plus
7
from urllib import quote_plus
614
8
8
615
9
from django.core.urlresolvers import reverse
616
10
from django.test.utils import override_settings
9
from django.test.utils import override_settings
617
10
from django.urls import reverse
618
11
from openid import fetchers
11
from openid import fetchers
619
12
from openid.consumer import consumer
12
from openid.consumer import consumer
620
13
from openid.consumer.discover import OPENID_2_0_TYPE, OpenIDServiceEndpoint
13
from openid.consumer.discover import OPENID_2_0_TYPE, OpenIDServiceEndpoint
621
14
14
622
=== modified file 'src/webui/tests/test_views_devices.py'
623
--- src/webui/tests/test_views_devices.py	2018-03-16 13:30:26 +0000
624
+++ src/webui/tests/test_views_devices.py	2018-05-30 16:21:15 +0000
625
@@ -9,9 +9,9 @@
626
9
9
627
10
import mock
10
import mock
628
11
from django.conf import settings
11
from django.conf import settings
629
12
from django.core.urlresolvers import reverse
630
13
from django.db import transaction
12
from django.db import transaction
631
14
from django.test.utils import override_settings
13
from django.test.utils import override_settings
632
14
from django.urls import reverse
633
15
from django.utils.timezone import now
15
from django.utils.timezone import now
634
16
from gargoyle.testutils import switches
16
from gargoyle.testutils import switches
635
17
from oath import hotp, totp
17
from oath import hotp, totp
636
18
18
637
=== modified file 'src/webui/tests/test_views_i18n.py'
638
--- src/webui/tests/test_views_i18n.py	2018-02-09 20:56:16 +0000
639
+++ src/webui/tests/test_views_i18n.py	2018-05-30 16:21:15 +0000
640
@@ -1,6 +1,6 @@
641
1
from __future__ import unicode_literals
1
from __future__ import unicode_literals
642
2
2
644
3
from django.core.urlresolvers import reverse
3
from django.urls import reverse
645
4
4
646
5
from identityprovider.models.account import Account
5
from identityprovider.models.account import Account
647
6
from identityprovider.tests import DEFAULT_USER_PASSWORD
6
from identityprovider.tests import DEFAULT_USER_PASSWORD
648
7
7
649
=== modified file 'src/webui/tests/test_views_registration.py'
650
--- src/webui/tests/test_views_registration.py	2018-05-25 22:00:09 +0000
651
+++ src/webui/tests/test_views_registration.py	2018-05-30 16:21:15 +0000
652
@@ -9,8 +9,8 @@
653
9
9
654
10
from django.conf import settings
10
from django.conf import settings
655
11
from django.contrib.auth.models import AnonymousUser
11
from django.contrib.auth.models import AnonymousUser
656
12
from django.core.urlresolvers import reverse
657
13
from django.test.utils import override_settings
12
from django.test.utils import override_settings
658
13
from django.urls import reverse
659
14
14
660
15
from gargoyle.testutils import switches
15
from gargoyle.testutils import switches
661
16
from mock import Mock, call
16
from mock import Mock, call
662
17
17
663
=== modified file 'src/webui/tests/test_views_ui.py'
664
--- src/webui/tests/test_views_ui.py	2018-02-20 17:14:51 +0000
665
+++ src/webui/tests/test_views_ui.py	2018-05-30 16:21:15 +0000
666
@@ -25,9 +25,9 @@
667
25
from django.core import mail
25
from django.core import mail
668
26
from django.core.cache import cache
26
from django.core.cache import cache
669
27
from django.core.exceptions import ValidationError
27
from django.core.exceptions import ValidationError
670
28
from django.core.urlresolvers import reverse
671
29
from django.http import QueryDict
28
from django.http import QueryDict
672
30
from django.test.utils import override_settings
29
from django.test.utils import override_settings
673
30
from django.urls import reverse
674
31
from django.utils.html import escape
31
from django.utils.html import escape
675
32
from gargoyle import gargoyle
32
from gargoyle import gargoyle
676
33
from gargoyle.testutils import switches
33
from gargoyle.testutils import switches
677
@@ -1964,7 +1964,7 @@
678
1964
        account = Account.objects.get(id=self.account.id)
1964
        account = Account.objects.get(id=self.account.id)
679
1965
1965
680
1966
        self.assertTemplateUsed(response, 'account/suspended.html')
1966
        self.assertTemplateUsed(response, 'account/suspended.html')
682
1967
        self.assertFalse(response.context['user'].is_authenticated())
1967
        self.assertFalse(response.context['user'].is_authenticated)
683
1968
        self.assertEqual(account.status, AccountStatus.SUSPENDED)
1968
        self.assertEqual(account.status, AccountStatus.SUSPENDED)
684
1969
        # since the account is NOT on the expected team, no email is sent
1969
        # since the account is NOT on the expected team, no email is sent
685
1970
        self.assert_no_emails_sent()
1970
        self.assert_no_emails_sent()
686
@@ -1979,7 +1979,7 @@
687
1979
        account = Account.objects.get(id=self.account.id)
1979
        account = Account.objects.get(id=self.account.id)
688
1980
1980
689
1981
        self.assertTemplateUsed(response, 'account/suspended.html')
1981
        self.assertTemplateUsed(response, 'account/suspended.html')
691
1982
        self.assertFalse(response.context['user'].is_authenticated())
1982
        self.assertFalse(response.context['user'].is_authenticated)
692
1983
        self.assertEqual(account.status, AccountStatus.SUSPENDED)
1983
        self.assertEqual(account.status, AccountStatus.SUSPENDED)
693
1984
        # since the account is on the expected team, a notification is sent
1984
        # since the account is on the expected team, a notification is sent
694
1985
        self.assert_account_suspended_warning_sent(account)
1985
        self.assert_account_suspended_warning_sent(account)
695
1986
1986
696
=== modified file 'src/webui/views/account.py'
697
--- src/webui/views/account.py	2018-05-25 20:41:26 +0000
698
+++ src/webui/views/account.py	2018-05-30 16:21:15 +0000
699
@@ -10,11 +10,11 @@
700
10
10
701
11
from django.conf import settings
11
from django.conf import settings
702
12
from django.contrib import auth, messages
12
from django.contrib import auth, messages
703
13
from django.core.urlresolvers import reverse
704
14
from django.http import HttpResponseRedirect
13
from django.http import HttpResponseRedirect
705
15
from django.shortcuts import get_object_or_404, render
14
from django.shortcuts import get_object_or_404, render
706
16
from django.template.loader import render_to_string
15
from django.template.loader import render_to_string
707
17
from django.template.response import TemplateResponse
16
from django.template.response import TemplateResponse
708
17
from django.urls import reverse
709
18
from django.views.decorators.vary import vary_on_headers
18
from django.views.decorators.vary import vary_on_headers
710
19
from gargoyle import gargoyle
19
from gargoyle import gargoyle
711
20
from gargoyle.decorators import switch_is_active
20
from gargoyle.decorators import switch_is_active
712
21
21
713
=== modified file 'src/webui/views/consumer.py'
714
--- src/webui/views/consumer.py	2018-02-09 20:56:16 +0000
715
+++ src/webui/views/consumer.py	2018-05-30 16:21:15 +0000
716
@@ -13,9 +13,9 @@
717
13
13
718
14
from django.conf import settings
14
from django.conf import settings
719
15
from django.contrib import messages
15
from django.contrib import messages
720
16
from django.core.urlresolvers import reverse
721
17
from django.http import HttpResponseRedirect
16
from django.http import HttpResponseRedirect
722
18
from django.shortcuts import render
17
from django.shortcuts import render
723
18
from django.urls import reverse
724
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import ugettext_lazy as _
725
20
from django.views.decorators.csrf import csrf_exempt
20
from django.views.decorators.csrf import csrf_exempt
726
21
from django_openid_auth.store import DjangoOpenIDStore
21
from django_openid_auth.store import DjangoOpenIDStore
727
22
22
728
=== modified file 'src/webui/views/devices.py'
729
--- src/webui/views/devices.py	2018-02-09 20:56:16 +0000
730
+++ src/webui/views/devices.py	2018-05-30 16:21:15 +0000
731
@@ -10,10 +10,10 @@
732
10
from django.conf import settings
10
from django.conf import settings
733
11
from django.contrib import messages
11
from django.contrib import messages
734
12
from django.contrib.auth.views import redirect_to_login
12
from django.contrib.auth.views import redirect_to_login
735
13
from django.core.urlresolvers import reverse
736
14
from django.http import HttpResponseRedirect
13
from django.http import HttpResponseRedirect
737
15
from django.shortcuts import get_object_or_404, render
14
from django.shortcuts import get_object_or_404, render
738
16
from django.template.response import TemplateResponse
15
from django.template.response import TemplateResponse
739
16
from django.urls import reverse
740
17
from django.utils.translation import ugettext_lazy as _
17
from django.utils.translation import ugettext_lazy as _
741
18
from django.views.generic import View
18
from django.views.generic import View
742
19
from gargoyle import gargoyle
19
from gargoyle import gargoyle
743
20
20
744
=== modified file 'src/webui/views/errors.py'
745
--- src/webui/views/errors.py	2018-02-14 14:05:59 +0000
746
+++ src/webui/views/errors.py	2018-05-30 16:21:15 +0000
747
@@ -12,7 +12,7 @@
748
12
        self.status_code = status
12
        self.status_code = status
749
13
        self.errormsg = errormsg
13
        self.errormsg = errormsg
750
14
14
752
15
    def __call__(self, request):
15
    def __call__(self, request, exception=None):
753
16
        oopsid = request.environ.get('oops.report', {}).get('id', None)
16
        oopsid = request.environ.get('oops.report', {}).get('id', None)
754
17
        atts = {
17
        atts = {
755
18
            'request': request,
18
            'request': request,
756
19
19
757
=== modified file 'src/webui/views/i18n.py'
758
--- src/webui/views/i18n.py	2018-02-09 20:56:16 +0000
759
+++ src/webui/views/i18n.py	2018-05-30 16:21:15 +0000
760
@@ -34,7 +34,7 @@
761
34
    if lang not in settings.SUPPORTED_LANGUAGES:
34
    if lang not in settings.SUPPORTED_LANGUAGES:
762
35
        raise Http404('Unsupported language')
35
        raise Http404('Unsupported language')
763
36
36
765
37
    if request.user.is_authenticated():
37
    if request.user.is_authenticated:
766
38
        account = request.user
38
        account = request.user
767
39
        account.preferredlanguage = lang
39
        account.preferredlanguage = lang
768
40
        account.save()
40
        account.save()
769
41
41
770
=== modified file 'src/webui/views/registration.py'
771
--- src/webui/views/registration.py	2018-02-15 11:27:21 +0000
772
+++ src/webui/views/registration.py	2018-05-30 16:21:15 +0000
773
@@ -7,7 +7,6 @@
774
7
from django.conf import settings
7
from django.conf import settings
775
8
from django.contrib import auth, messages
8
from django.contrib import auth, messages
776
9
from django.contrib.auth.decorators import login_required
9
from django.contrib.auth.decorators import login_required
777
10
from django.core.urlresolvers import reverse
778
11
from django.http import (
10
from django.http import (
779
12
    HttpResponseNotAllowed,
11
    HttpResponseNotAllowed,
780
13
    HttpResponseRedirect,
12
    HttpResponseRedirect,
781
@@ -15,6 +14,7 @@
782
15
)
14
)
783
16
from django.template.loader import render_to_string
15
from django.template.loader import render_to_string
784
17
from django.template.response import TemplateResponse
16
from django.template.response import TemplateResponse
785
17
from django.urls import reverse
786
18
from django.utils.decorators import method_decorator
18
from django.utils.decorators import method_decorator
787
19
from django.utils.translation import ugettext_lazy as _
19
from django.utils.translation import ugettext_lazy as _
788
20
from django.views.decorators.http import require_http_methods
20
from django.views.decorators.http import require_http_methods
789
21
21
790
=== modified file 'src/webui/views/ui.py'
791
--- src/webui/views/ui.py	2018-05-10 20:20:47 +0000
792
+++ src/webui/views/ui.py	2018-05-30 16:21:15 +0000
793
@@ -11,7 +11,6 @@
794
11
from django.conf import settings
11
from django.conf import settings
795
12
from django.contrib import auth, messages
12
from django.contrib import auth, messages
796
13
from django.contrib.auth.decorators import login_required
13
from django.contrib.auth.decorators import login_required
797
14
from django.core.urlresolvers import reverse
798
15
from django.http import (
14
from django.http import (
799
16
    Http404,
15
    Http404,
800
17
    HttpResponse,
16
    HttpResponse,
801
@@ -25,6 +24,7 @@
802
25
)
24
)
803
26
from django.template.loader import render_to_string
25
from django.template.loader import render_to_string
804
27
from django.template.response import TemplateResponse
26
from django.template.response import TemplateResponse
805
27
from django.urls import reverse
806
28
from django.utils.decorators import method_decorator
28
from django.utils.decorators import method_decorator
807
29
from django.utils.http import urlquote
29
from django.utils.http import urlquote
808
30
from django.utils.translation import ugettext_lazy as _
30
from django.utils.translation import ugettext_lazy as _
Status:	Merged
Approved by:	Daniel Manrique on 2018-05-30
Approved revision:	no longer in the source branch.
Merge reported by:	Otto Co-Pilot
Merged at revision:	not available
Proposed branch:	lp:~roadmr/canonical-identity-provider/fix-deprecation-warnings-3
Merge into:	lp:canonical-identity-provider/release
Diff against target:	808 lines (+68/-62) 50 files modified src/api/v10/tests/test_handlers.py (+1/-1) src/api/v20/tests/test_auth.py (+1/-1) src/api/v20/tests/test_decorators.py (+1/-1) src/api/v20/tests/test_handlers.py (+2/-1) src/api/v20/tests/test_login.py (+1/-1) src/api/v20/tests/test_urls.py (+2/-1) src/api/v20/tests/test_utils.py (+1/-1) src/api/v20/utils.py (+1/-1) src/identityprovider/admin.py (+1/-1) src/identityprovider/emailutils.py (+1/-1) src/identityprovider/forms.py (+1/-1) src/identityprovider/middleware/useraccount.py (+1/-1) src/identityprovider/middleware/xrds.py (+2/-1) src/identityprovider/models/authtoken.py (+1/-1) src/identityprovider/tests/helpers.py (+1/-1) src/identityprovider/tests/openid_server/per_version/test_logout_during_login.py (+1/-1) src/identityprovider/tests/openid_server/per_version/test_sso_workflow_authorize.py (+1/-1) src/identityprovider/tests/sso_server/test_standalone_login.py (+1/-1) src/identityprovider/tests/test_admin.py (+1/-1) src/identityprovider/tests/test_emailutils.py (+1/-1) src/identityprovider/tests/test_models_authtoken.py (+1/-1) src/identityprovider/tests/test_readonly.py (+1/-1) src/identityprovider/tests/test_signals.py (+1/-1) src/identityprovider/tests/test_views_server.py (+1/-1) src/identityprovider/tests/test_views_testing.py (+1/-1) src/identityprovider/tests/test_xrds.py (+1/-1) src/identityprovider/utils.py (+1/-1) src/identityprovider/views/server.py (+1/-1) src/identityprovider/widgets.py (+12/-10) src/ubuntu_sso_saml/tests/test_processors.py (+1/-1) src/ubuntu_sso_saml/tests/test_views.py (+1/-1) src/ubuntu_sso_saml/views.py (+1/-1) src/webui/decorators.py (+1/-1) src/webui/tests/test_decorators.py (+2/-2) src/webui/tests/test_templates.py (+1/-1) src/webui/tests/test_views_account.py (+2/-1) src/webui/tests/test_views_account_ssh.py (+1/-1) src/webui/tests/test_views_auth_log.py (+1/-1) src/webui/tests/test_views_consumer.py (+1/-1) src/webui/tests/test_views_devices.py (+1/-1) src/webui/tests/test_views_i18n.py (+1/-1) src/webui/tests/test_views_registration.py (+1/-1) src/webui/tests/test_views_ui.py (+3/-3) src/webui/views/account.py (+1/-1) src/webui/views/consumer.py (+1/-1) src/webui/views/devices.py (+1/-1) src/webui/views/errors.py (+1/-1) src/webui/views/i18n.py (+1/-1) src/webui/views/registration.py (+1/-1) src/webui/views/ui.py (+1/-1)
To merge this branch:	bzr merge lp:~roadmr/canonical-identity-provider/fix-deprecation-warnings-3
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Maximiliano Bertacchini		2018-05-30	Approve on 2018-05-30
Review via email: mp+347154@code.launchpad.net