]>
Commit | Line | Data |
---|---|---|
e56bceb6 JB |
1 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py.orig 2019-08-06 16:49:50.000000000 +0200 |
2 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_access_token.py 2021-01-19 22:40:03.003939701 +0100 | |
3 | @@ -1,6 +1,9 @@ | |
4 | from __future__ import absolute_import, unicode_literals | |
5 | ||
6 | -from mock import ANY, MagicMock | |
7 | +try: | |
8 | + from mock import ANY, MagicMock | |
9 | +except ImportError: | |
10 | + from unittest.mock import ANY, MagicMock | |
11 | ||
12 | from oauthlib.oauth1 import RequestValidator | |
13 | from oauthlib.oauth1.rfc5849 import Client | |
14 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py.orig 2021-01-19 22:40:27.960471167 +0100 | |
15 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_authorization.py 2021-01-19 22:40:30.890455294 +0100 | |
16 | @@ -1,6 +1,9 @@ | |
17 | from __future__ import absolute_import, unicode_literals | |
18 | ||
19 | -from mock import MagicMock | |
20 | +try: | |
21 | + from mock import MagicMock | |
22 | +except ImportError: | |
23 | + from unittest.mock import MagicMock | |
24 | ||
25 | from oauthlib.oauth1 import RequestValidator | |
26 | from oauthlib.oauth1.rfc5849 import errors | |
27 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py.orig 2021-01-19 22:40:51.857008375 +0100 | |
28 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_base.py 2021-01-19 22:40:54.676993098 +0100 | |
29 | @@ -2,7 +2,10 @@ | |
30 | ||
31 | from re import sub | |
32 | ||
33 | -from mock import MagicMock | |
34 | +try: | |
35 | + from mock import MagicMock | |
36 | +except ImportError: | |
37 | + from unittest.mock import MagicMock | |
38 | ||
39 | from oauthlib.common import CaseInsensitiveDict, safe_string_equals | |
40 | from oauthlib.oauth1 import Client, RequestValidator | |
41 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
42 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_request_token.py 2021-01-19 22:41:10.330241630 +0100 | |
43 | @@ -1,6 +1,9 @@ | |
44 | from __future__ import absolute_import, unicode_literals | |
45 | ||
46 | -from mock import ANY, MagicMock | |
47 | +try: | |
48 | + from mock import ANY, MagicMock | |
49 | +except ImportError: | |
50 | + from unittest.mock import ANY, MagicMock | |
51 | ||
52 | from oauthlib.oauth1 import RequestValidator | |
53 | from oauthlib.oauth1.rfc5849 import Client | |
54 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
55 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_resource.py 2021-01-19 22:41:22.446842656 +0100 | |
56 | @@ -1,6 +1,9 @@ | |
57 | from __future__ import absolute_import, unicode_literals | |
58 | ||
59 | -from mock import ANY, MagicMock | |
60 | +try: | |
61 | + from mock import ANY, MagicMock | |
62 | +except ImportError: | |
63 | + from unittest.mock import ANY, MagicMock | |
64 | ||
65 | from oauthlib.oauth1 import RequestValidator | |
66 | from oauthlib.oauth1.rfc5849 import Client | |
67 | --- oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
68 | +++ oauthlib-3.1.0/tests/oauth1/rfc5849/endpoints/test_signature_only.py 2021-01-19 22:41:31.180128677 +0100 | |
69 | @@ -1,6 +1,9 @@ | |
70 | from __future__ import absolute_import, unicode_literals | |
71 | ||
72 | -from mock import ANY, MagicMock | |
73 | +try: | |
74 | + from mock import ANY, MagicMock | |
75 | +except ImportError: | |
76 | + from unittest.mock import ANY, MagicMock | |
77 | ||
78 | from oauthlib.oauth1 import RequestValidator | |
79 | from oauthlib.oauth1.rfc5849 import Client | |
80 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
81 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_parameters.py 2021-01-19 22:42:03.646619457 +0100 | |
82 | @@ -1,6 +1,9 @@ | |
83 | from __future__ import absolute_import, unicode_literals | |
84 | ||
85 | -from mock import patch | |
86 | +try: | |
87 | + from mock import patch | |
88 | +except ImportError: | |
89 | + from unittest.mock import patch | |
90 | ||
91 | from oauthlib import signals | |
92 | from oauthlib.oauth2.rfc6749.errors import * | |
93 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py.orig 2021-01-19 22:42:27.483156991 +0100 | |
94 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_server.py 2021-01-19 22:42:30.473140792 +0100 | |
95 | @@ -3,7 +3,10 @@ | |
96 | ||
97 | import json | |
98 | ||
99 | -import mock | |
100 | +try: | |
101 | + import mock | |
102 | +except ImportError: | |
103 | + from unittest import mock | |
104 | ||
105 | from oauthlib import common | |
106 | from oauthlib.oauth2.rfc6749 import errors, tokens | |
107 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py.orig 2021-01-19 22:42:40.903084289 +0100 | |
108 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/test_tokens.py 2021-01-19 22:42:43.576403139 +0100 | |
109 | @@ -1,6 +1,9 @@ | |
110 | from __future__ import absolute_import, unicode_literals | |
111 | ||
112 | -import mock | |
113 | +try: | |
114 | + import mock | |
115 | +except ImportError: | |
116 | + from unittest import mock | |
117 | ||
118 | from oauthlib.common import Request | |
119 | from oauthlib.oauth2.rfc6749.tokens import ( | |
120 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
121 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_backend_application.py 2021-01-19 22:43:18.329548199 +0100 | |
122 | @@ -3,7 +3,10 @@ | |
123 | ||
124 | import os | |
125 | ||
126 | -from mock import patch | |
127 | +try: | |
128 | + from mock import patch | |
129 | +except ImportError: | |
130 | + from unittest.mock import patch | |
131 | ||
132 | from oauthlib import signals | |
133 | from oauthlib.oauth2 import BackendApplicationClient | |
134 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
135 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_legacy_application.py 2021-01-19 22:43:29.019490286 +0100 | |
136 | @@ -3,7 +3,10 @@ | |
137 | ||
138 | import os | |
139 | ||
140 | -from mock import patch | |
141 | +try: | |
142 | + from mock import patch | |
143 | +except ImportError: | |
144 | + from unittest.mock import patch | |
145 | ||
146 | from oauthlib import signals | |
147 | from oauthlib.oauth2 import LegacyApplicationClient | |
148 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
149 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_mobile_application.py 2021-01-19 22:43:40.542761193 +0100 | |
150 | @@ -3,7 +3,10 @@ | |
151 | ||
152 | import os | |
153 | ||
154 | -from mock import patch | |
155 | +try: | |
156 | + from mock import patch | |
157 | +except ImportError: | |
158 | + from unittest.mock import patch | |
159 | ||
160 | from oauthlib import signals | |
161 | from oauthlib.oauth2 import MobileApplicationClient | |
162 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
163 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_service_application.py 2021-01-19 22:43:53.589357180 +0100 | |
164 | @@ -5,7 +5,10 @@ | |
165 | from time import time | |
166 | ||
167 | import jwt | |
168 | -from mock import patch | |
169 | +try: | |
170 | + from mock import patch | |
171 | +except ImportError: | |
172 | + from unittest.mock import patch | |
173 | ||
174 | from oauthlib.common import Request | |
175 | from oauthlib.oauth2 import ServiceApplicationClient | |
176 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
177 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/clients/test_web_application.py 2021-01-19 22:44:01.972645097 +0100 | |
178 | @@ -5,7 +5,10 @@ | |
179 | import os | |
180 | import warnings | |
181 | ||
182 | -from mock import patch | |
183 | +try: | |
184 | + from mock import patch | |
185 | +except ImportError: | |
186 | + from unittest.mock import patch | |
187 | ||
188 | from oauthlib import common, signals | |
189 | from oauthlib.oauth2 import (BackendApplicationClient, Client, | |
190 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
191 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_client_authentication.py 2021-01-19 22:44:33.512474231 +0100 | |
192 | @@ -13,7 +13,10 @@ | |
193 | ||
194 | import json | |
195 | ||
196 | -import mock | |
197 | +try: | |
198 | + import mock | |
199 | +except ImportError: | |
200 | + from unittest import mock | |
201 | ||
202 | from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, | |
203 | MobileApplicationServer, RequestValidator, | |
204 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
205 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_credentials_preservation.py 2021-01-19 22:44:44.342415560 +0100 | |
206 | @@ -7,7 +7,10 @@ | |
207 | ||
208 | import json | |
209 | ||
210 | -import mock | |
211 | +try: | |
212 | + import mock | |
213 | +except ImportError: | |
214 | + from unittest import mock | |
215 | ||
216 | from oauthlib.oauth2 import (MobileApplicationServer, RequestValidator, | |
217 | WebApplicationServer) | |
218 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
219 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_error_responses.py 2021-01-19 22:44:51.862374821 +0100 | |
220 | @@ -4,7 +4,10 @@ | |
221 | ||
222 | import json | |
223 | ||
224 | -import mock | |
225 | +try: | |
226 | + import mock | |
227 | +except ImportError: | |
228 | + from unittest import mock | |
229 | ||
230 | from oauthlib.common import urlencode | |
231 | from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, | |
232 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
233 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_extra_credentials.py 2021-01-19 22:44:58.605671623 +0100 | |
234 | @@ -2,7 +2,10 @@ | |
235 | """ | |
236 | from __future__ import absolute_import, unicode_literals | |
237 | ||
238 | -import mock | |
239 | +try: | |
240 | + import mock | |
241 | +except ImportError: | |
242 | + from unittest import mock | |
243 | ||
244 | from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, | |
245 | MobileApplicationServer, RequestValidator, | |
246 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
247 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_introspect_endpoint.py 2021-01-20 06:29:03.418156665 +0100 | |
248 | @@ -3,7 +3,10 @@ | |
249 | ||
250 | from json import loads | |
251 | ||
252 | -from mock import MagicMock | |
253 | +try: | |
254 | + from mock import MagicMock | |
255 | +except ImportError: | |
256 | + from unittest.mock import MagicMock | |
257 | ||
258 | from oauthlib.common import urlencode | |
259 | from oauthlib.oauth2 import RequestValidator, IntrospectEndpoint | |
260 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
261 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_resource_owner_association.py 2021-01-20 06:29:27.541359312 +0100 | |
262 | @@ -4,7 +4,10 @@ | |
263 | ||
264 | import json | |
265 | ||
266 | -import mock | |
267 | +try: | |
268 | + import mock | |
269 | +except ImportError: | |
270 | + from unittest import mock | |
271 | ||
272 | from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, | |
273 | MobileApplicationServer, RequestValidator, | |
274 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
275 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_revocation_endpoint.py 2021-01-20 06:29:59.414519974 +0100 | |
276 | @@ -3,7 +3,10 @@ | |
277 | ||
278 | from json import loads | |
279 | ||
280 | -from mock import MagicMock | |
281 | +try: | |
282 | + from mock import MagicMock | |
283 | +except ImportError: | |
284 | + from unittest.mock import MagicMock | |
285 | ||
286 | from oauthlib.common import urlencode | |
287 | from oauthlib.oauth2 import RequestValidator, RevocationEndpoint | |
288 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
289 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/endpoints/test_scope_handling.py 2021-01-20 06:30:23.811054473 +0100 | |
290 | @@ -7,7 +7,10 @@ | |
291 | ||
292 | import json | |
293 | ||
294 | -import mock | |
295 | +try: | |
296 | + import mock | |
297 | +except ImportError: | |
298 | + from unittest import mock | |
299 | ||
300 | from oauthlib.oauth2 import (BackendApplicationServer, LegacyApplicationServer, | |
301 | MobileApplicationServer, RequestValidator, Server, | |
302 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
303 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_authorization_code.py 2021-01-20 06:30:47.664258582 +0100 | |
304 | @@ -3,7 +3,10 @@ | |
305 | ||
306 | import json | |
307 | ||
308 | -import mock | |
309 | +try: | |
310 | + import mock | |
311 | +except ImportError: | |
312 | + from unittest import mock | |
313 | ||
314 | from oauthlib.common import Request | |
315 | from oauthlib.oauth2.rfc6749 import errors | |
316 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
317 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_client_credentials.py 2021-01-20 06:30:56.990874722 +0100 | |
318 | @@ -3,7 +3,10 @@ | |
319 | ||
320 | import json | |
321 | ||
322 | -import mock | |
323 | +try: | |
324 | + import mock | |
325 | +except ImportError: | |
326 | + from unittest import mock | |
327 | ||
328 | from oauthlib.common import Request | |
329 | from oauthlib.oauth2.rfc6749.grant_types import ClientCredentialsGrant | |
330 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
331 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_implicit.py 2021-01-20 06:31:14.254114533 +0100 | |
332 | @@ -1,7 +1,10 @@ | |
333 | # -*- coding: utf-8 -*- | |
334 | from __future__ import absolute_import, unicode_literals | |
335 | ||
336 | -import mock | |
337 | +try: | |
338 | + import mock | |
339 | +except ImportError: | |
340 | + from unittest import mock | |
341 | ||
342 | from oauthlib.common import Request | |
343 | from oauthlib.oauth2.rfc6749.grant_types import ImplicitGrant | |
344 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
345 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_refresh_token.py 2021-01-20 06:31:22.744068539 +0100 | |
346 | @@ -3,7 +3,10 @@ | |
347 | ||
348 | import json | |
349 | ||
350 | -import mock | |
351 | +try: | |
352 | + import mock | |
353 | +except ImportError: | |
354 | + from unittest import mock | |
355 | ||
356 | from oauthlib.common import Request | |
357 | from oauthlib.oauth2.rfc6749 import errors | |
358 | --- oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
359 | +++ oauthlib-3.1.0/tests/oauth2/rfc6749/grant_types/test_resource_owner_password.py 2021-01-20 06:31:30.267361115 +0100 | |
360 | @@ -3,7 +3,10 @@ | |
361 | ||
362 | import json | |
363 | ||
364 | -import mock | |
365 | +try: | |
366 | + import mock | |
367 | +except ImportError: | |
368 | + from unittest import mock | |
369 | ||
370 | from oauthlib.common import Request | |
371 | from oauthlib.oauth2.rfc6749 import errors | |
372 | --- oauthlib-3.1.0/tests/openid/connect/core/test_server.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
373 | +++ oauthlib-3.1.0/tests/openid/connect/core/test_server.py 2021-01-20 06:32:04.097177843 +0100 | |
374 | @@ -3,7 +3,10 @@ | |
375 | ||
376 | import json | |
377 | ||
378 | -import mock | |
379 | +try: | |
380 | + import mock | |
381 | +except ImportError: | |
382 | + from unittest import mock | |
383 | ||
384 | from oauthlib.oauth2.rfc6749 import errors | |
385 | from oauthlib.oauth2.rfc6749.endpoints.authorization import AuthorizationEndpoint | |
386 | --- oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
387 | +++ oauthlib-3.1.0/tests/openid/connect/core/test_tokens.py 2021-01-20 06:32:14.287122640 +0100 | |
388 | @@ -1,6 +1,9 @@ | |
389 | from __future__ import absolute_import, unicode_literals | |
390 | ||
391 | -import mock | |
392 | +try: | |
393 | + import mock | |
394 | +except ImportError: | |
395 | + from unittest import mock | |
396 | ||
397 | from oauthlib.openid.connect.core.tokens import JWTToken | |
398 | ||
399 | --- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
400 | +++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_claims_handling.py 2021-01-20 06:32:35.520340943 +0100 | |
401 | @@ -8,7 +8,10 @@ | |
402 | """ | |
403 | from __future__ import absolute_import, unicode_literals | |
404 | ||
405 | -import mock | |
406 | +try: | |
407 | + import mock | |
408 | +except ImportError: | |
409 | + from unittest import mock | |
410 | ||
411 | from oauthlib.openid import RequestValidator | |
412 | from oauthlib.openid.connect.core.endpoints.pre_configured import Server | |
413 | --- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
414 | +++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_openid_connect_params_handling.py 2021-01-20 06:32:41.513641807 +0100 | |
415 | @@ -1,6 +1,9 @@ | |
416 | from __future__ import absolute_import, unicode_literals | |
417 | ||
418 | -import mock | |
419 | +try: | |
420 | + import mock | |
421 | +except ImportError: | |
422 | + from unittest import mock | |
423 | ||
424 | from oauthlib.oauth2 import InvalidRequestError | |
425 | from oauthlib.oauth2.rfc6749.endpoints.authorization import \ | |
426 | --- oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
427 | +++ oauthlib-3.1.0/tests/openid/connect/core/endpoints/test_userinfo_endpoint.py 2021-01-20 06:32:50.640259031 +0100 | |
428 | @@ -1,7 +1,10 @@ | |
429 | # -*- coding: utf-8 -*- | |
430 | from __future__ import absolute_import, unicode_literals | |
431 | ||
432 | -import mock | |
433 | +try: | |
434 | + import mock | |
435 | +except ImportError: | |
436 | + from unittest import mock | |
437 | import json | |
438 | ||
439 | from oauthlib.openid import RequestValidator | |
440 | --- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
441 | +++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_authorization_code.py 2021-01-20 06:33:04.566850251 +0100 | |
442 | @@ -3,7 +3,10 @@ | |
443 | ||
444 | import json | |
445 | ||
446 | -import mock | |
447 | +try: | |
448 | + import mock | |
449 | +except ImportError: | |
450 | + from unittest import mock | |
451 | ||
452 | from oauthlib.common import Request | |
453 | from oauthlib.oauth2.rfc6749.tokens import BearerToken | |
454 | --- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
455 | +++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_base.py 2021-01-20 06:33:09.870154854 +0100 | |
456 | @@ -1,5 +1,8 @@ | |
457 | # -*- coding: utf-8 -*- | |
458 | -import mock | |
459 | +try: | |
460 | + import mock | |
461 | +except ImportError: | |
462 | + from unittest import mock | |
463 | import time | |
464 | ||
465 | from oauthlib.common import Request | |
466 | --- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
467 | +++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_dispatchers.py 2021-01-20 06:33:17.646779391 +0100 | |
468 | @@ -1,6 +1,9 @@ | |
469 | # -*- coding: utf-8 -*- | |
470 | from __future__ import absolute_import, unicode_literals | |
471 | -import mock | |
472 | +try: | |
473 | + import mock | |
474 | +except ImportError: | |
475 | + from unittest import mock | |
476 | ||
477 | from oauthlib.common import Request | |
478 | ||
479 | --- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
480 | +++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_hybrid.py 2021-01-20 06:33:28.630053223 +0100 | |
481 | @@ -1,7 +1,10 @@ | |
482 | # -*- coding: utf-8 -*- | |
483 | from __future__ import absolute_import, unicode_literals | |
484 | ||
485 | -import mock | |
486 | +try: | |
487 | + import mock | |
488 | +except ImportError: | |
489 | + from unittest import mock | |
490 | ||
491 | from oauthlib.oauth2.rfc6749 import errors | |
492 | from oauthlib.oauth2.rfc6749.tokens import BearerToken | |
493 | --- oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py.orig 2019-08-06 16:49:50.000000000 +0200 | |
494 | +++ oauthlib-3.1.0/tests/openid/connect/core/grant_types/test_implicit.py 2021-01-20 06:33:34.116690166 +0100 | |
495 | @@ -1,7 +1,10 @@ | |
496 | # -*- coding: utf-8 -*- | |
497 | from __future__ import absolute_import, unicode_literals | |
498 | ||
499 | -import mock | |
500 | +try: | |
501 | + import mock | |
502 | +except ImportError: | |
503 | + from unittest import mock | |
504 | ||
505 | from oauthlib.common import Request | |
506 | from oauthlib.oauth2.rfc6749 import errors |