Skip to content

Commit dab6662

Browse files
lnagellnagel
committed
Remove PY2 compat, reformat using black
1 parent f2741bc commit dab6662

File tree

5 files changed

+72
-68
lines changed

5 files changed

+72
-68
lines changed

‎rest_framework_sso/keys.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# coding: utf-8
22
import os
3-
import six
43

54
from cryptography.hazmat.backends import default_backend
65
from cryptography.hazmat.primitives.serialization import load_pem_private_key, load_pem_public_key
@@ -34,7 +33,7 @@ def get_key_file_name(keys, issuer, key_id=None):
3433
if not keys.get(issuer):
3534
raise InvalidKeyError("No keys defined for the given issuer")
3635
issuer_keys = keys.get(issuer)
37-
if isinstance(issuer_keys, (str, six.text_type)):
36+
if isinstance(issuer_keys, str):
3837
issuer_keys = [issuer_keys]
3938
if key_id:
4039
issuer_keys = [ik for ik in issuer_keys if key_id in (ik, get_key_id(ik))]

‎rest_framework_sso/migrations/0002_sessiontoken_last_used_at.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
('rest_framework_sso', '0001_initial'),
9+
("rest_framework_sso", "0001_initial"),
1010
]
1111

1212
operations = [
1313
migrations.AddField(
14-
model_name='sessiontoken',
15-
name='last_used_at',
14+
model_name="sessiontoken",
15+
name="last_used_at",
1616
field=models.DateTimeField(blank=True, db_index=True, null=True),
1717
),
1818
]

‎rest_framework_sso/models.py‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,10 @@
22
from __future__ import absolute_import, unicode_literals
33

44
import uuid
5-
import six
65

76
from django.conf import settings
87
from django.db import models
98

10-
try:
11-
from django.utils.encoding import python_2_unicode_compatible as smart_text
12-
except ImportError:
13-
from django.utils.encoding import smart_text
14-
159
from django.utils.translation import ugettext_lazy as _
1610

1711
# Prior to Django 1.5, the AUTH_USER_MODEL setting does not exist.
@@ -27,7 +21,6 @@
2721
AUTH_USER_MODEL = getattr(settings, "AUTH_USER_MODEL", "auth.User")
2822

2923

30-
@smart_text
3124
class SessionToken(models.Model):
3225
"""
3326
The default session token model.
@@ -54,7 +47,7 @@ class Meta:
5447
verbose_name_plural = _("Session tokens")
5548

5649
def __str__(self):
57-
return six.text_type(self.id)
50+
return str(self.id)
5851

5952
def update_attributes(self, request):
6053
if request.META.get("HTTP_X_FORWARDED_FOR"):

‎rest_framework_sso/utils.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# coding: utf-8
22
from __future__ import absolute_import, unicode_literals
33

4-
import six
54
import jwt
65

76
from datetime import datetime
@@ -96,14 +95,14 @@ def decode_jwt_token(token):
9695
unverified_claims = jwt.decode(token, verify=False)
9796

9897
if unverified_header.get(claims.KEY_ID):
99-
unverified_key_id = six.text_type(unverified_header.get(claims.KEY_ID))
98+
unverified_key_id = str(unverified_header.get(claims.KEY_ID))
10099
else:
101100
unverified_key_id = None
102101

103102
if claims.ISSUER not in unverified_claims:
104103
raise MissingRequiredClaimError(claims.ISSUER)
105104

106-
unverified_issuer = six.text_type(unverified_claims[claims.ISSUER])
105+
unverified_issuer = str(unverified_claims[claims.ISSUER])
107106

108107
if api_settings.ACCEPTED_ISSUERS is not None and unverified_issuer not in api_settings.ACCEPTED_ISSUERS:
109108
raise InvalidIssuerError("Invalid issuer")

‎tests/test_keys.py‎

Lines changed: 65 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# coding: utf-8
22
from __future__ import absolute_import, unicode_literals
3-
import six
43

54
from cryptography.hazmat.backends.openssl.rsa import _RSAPrivateKey, _RSAPublicKey
65
from django.test import TestCase
@@ -11,110 +10,124 @@
1110

1211
class TestReadKeyFile(TestCase):
1312
def test_read(self):
14-
key_data = keys.read_key_file('test-2048.pem')
15-
self.assertIsInstance(key_data, six.binary_type)
16-
key_data_lines = key_data.decode('utf-8').split('\n')
17-
self.assertIn('-----BEGIN PRIVATE KEY-----', key_data_lines)
18-
self.assertIn('-----END PRIVATE KEY-----', key_data_lines)
19-
self.assertIn('-----BEGIN PUBLIC KEY-----', key_data_lines)
20-
self.assertIn('-----END PUBLIC KEY-----', key_data_lines)
13+
key_data = keys.read_key_file("test-2048.pem")
14+
self.assertIsInstance(key_data, bytes)
15+
key_data_lines = key_data.decode("utf-8").split("\n")
16+
self.assertIn("-----BEGIN PRIVATE KEY-----", key_data_lines)
17+
self.assertIn("-----END PRIVATE KEY-----", key_data_lines)
18+
self.assertIn("-----BEGIN PUBLIC KEY-----", key_data_lines)
19+
self.assertIn("-----END PUBLIC KEY-----", key_data_lines)
2120

2221

2322
class TestGetKeyId(TestCase):
2423
def test_root_simple(self):
25-
key_id = keys.get_key_id(file_name='keyfile')
26-
self.assertEqual(key_id, 'keyfile')
24+
key_id = keys.get_key_id(file_name="keyfile")
25+
self.assertEqual(key_id, "keyfile")
2726

2827
def test_root_pem_extension(self):
29-
key_id = keys.get_key_id(file_name='keyfile.pem')
30-
self.assertEqual(key_id, 'keyfile')
28+
key_id = keys.get_key_id(file_name="keyfile.pem")
29+
self.assertEqual(key_id, "keyfile")
3130

3231
def test_subfolder_simple(self):
33-
key_id = keys.get_key_id(file_name='subfolder/keyfile')
34-
self.assertEqual(key_id, 'subfolder/keyfile')
32+
key_id = keys.get_key_id(file_name="subfolder/keyfile")
33+
self.assertEqual(key_id, "subfolder/keyfile")
3534

3635
def test_subfolder_pem_extension(self):
37-
key_id = keys.get_key_id(file_name='subfolder/keyfile.pem')
38-
self.assertEqual(key_id, 'subfolder/keyfile')
36+
key_id = keys.get_key_id(file_name="subfolder/keyfile.pem")
37+
self.assertEqual(key_id, "subfolder/keyfile")
3938

4039

4140
class TestGetKeyFileName(TestCase):
4241
def test_empty_keys(self):
43-
with self.assertRaisesMessage(InvalidKeyError, 'No keys defined for the given issuer'):
44-
keys.get_key_file_name(keys={}, issuer='test-issuer')
42+
with self.assertRaisesMessage(InvalidKeyError, "No keys defined for the given issuer"):
43+
keys.get_key_file_name(keys={}, issuer="test-issuer")
4544

4645
def test_other_issuer_keys(self):
47-
with self.assertRaisesMessage(InvalidKeyError, 'No keys defined for the given issuer'):
48-
keys.get_key_file_name(keys={'other-issuer': ['other-key.pem']}, issuer='test-issuer')
46+
with self.assertRaisesMessage(InvalidKeyError, "No keys defined for the given issuer"):
47+
keys.get_key_file_name(keys={"other-issuer": ["other-key.pem"]}, issuer="test-issuer")
4948

5049
def test_one_key_string(self):
51-
file_name = keys.get_key_file_name(keys={'test-issuer': 'first-key.pem'}, issuer='test-issuer')
52-
self.assertEqual(file_name, 'first-key.pem')
50+
file_name = keys.get_key_file_name(keys={"test-issuer": "first-key.pem"}, issuer="test-issuer")
51+
self.assertEqual(file_name, "first-key.pem")
5352

5453
def test_one_key_list(self):
55-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem']}, issuer='test-issuer')
56-
self.assertEqual(file_name, 'first-key.pem')
54+
file_name = keys.get_key_file_name(keys={"test-issuer": ["first-key.pem"]}, issuer="test-issuer")
55+
self.assertEqual(file_name, "first-key.pem")
5756

5857
def test_one_key_with_key_id(self):
59-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem']}, issuer='test-issuer')
60-
self.assertEqual(file_name, 'first-key.pem')
58+
file_name = keys.get_key_file_name(keys={"test-issuer": ["first-key.pem"]}, issuer="test-issuer")
59+
self.assertEqual(file_name, "first-key.pem")
6160

6261
def test_one_key_incorrect_key_id(self):
63-
with self.assertRaisesMessage(InvalidKeyError, 'No key matches the given key_id'):
64-
keys.get_key_file_name(keys={'test-issuer': ['first-key.pem']}, issuer='test-issuer', key_id='incorrect-key')
62+
with self.assertRaisesMessage(InvalidKeyError, "No key matches the given key_id"):
63+
keys.get_key_file_name(
64+
keys={"test-issuer": ["first-key.pem"]}, issuer="test-issuer", key_id="incorrect-key"
65+
)
6566

6667
def test_two_keys_no_key_id(self):
67-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer')
68-
self.assertEqual(file_name, 'first-key.pem')
68+
file_name = keys.get_key_file_name(
69+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer"
70+
)
71+
self.assertEqual(file_name, "first-key.pem")
6972

7073
def test_two_keys_with_key_id_1_exact(self):
71-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer', key_id='first-key.pem')
72-
self.assertEqual(file_name, 'first-key.pem')
74+
file_name = keys.get_key_file_name(
75+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer", key_id="first-key.pem"
76+
)
77+
self.assertEqual(file_name, "first-key.pem")
7378

7479
def test_two_keys_with_key_id_1_no_pem(self):
75-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer', key_id='first-key')
76-
self.assertEqual(file_name, 'first-key.pem')
80+
file_name = keys.get_key_file_name(
81+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer", key_id="first-key"
82+
)
83+
self.assertEqual(file_name, "first-key.pem")
7784

7885
def test_two_keys_with_key_id_2_exact(self):
79-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer', key_id='second-key.pem')
80-
self.assertEqual(file_name, 'second-key.pem')
86+
file_name = keys.get_key_file_name(
87+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer", key_id="second-key.pem"
88+
)
89+
self.assertEqual(file_name, "second-key.pem")
8190

8291
def test_two_keys_with_key_id_2_no_pem(self):
83-
file_name = keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer', key_id='second-key')
84-
self.assertEqual(file_name, 'second-key.pem')
92+
file_name = keys.get_key_file_name(
93+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer", key_id="second-key"
94+
)
95+
self.assertEqual(file_name, "second-key.pem")
8596

8697
def test_two_keys_incorrect_key_id(self):
87-
with self.assertRaisesMessage(InvalidKeyError, 'No key matches the given key_id'):
88-
keys.get_key_file_name(keys={'test-issuer': ['first-key.pem', 'second-key.pem']}, issuer='test-issuer', key_id='incorrect-key')
98+
with self.assertRaisesMessage(InvalidKeyError, "No key matches the given key_id"):
99+
keys.get_key_file_name(
100+
keys={"test-issuer": ["first-key.pem", "second-key.pem"]}, issuer="test-issuer", key_id="incorrect-key"
101+
)
89102

90103

91104
class TestGetPrivateKeyAndKeyId(TestCase):
92105
def test_empty_keys(self):
93-
with self.assertRaisesMessage(InvalidKeyError, 'No keys defined for the given issuer'):
94-
keys.get_private_key_and_key_id(issuer='other-issuer')
106+
with self.assertRaisesMessage(InvalidKeyError, "No keys defined for the given issuer"):
107+
keys.get_private_key_and_key_id(issuer="other-issuer")
95108

96109
def test_first_key(self):
97-
private_key, key_id = keys.get_private_key_and_key_id(issuer='test-issuer')
110+
private_key, key_id = keys.get_private_key_and_key_id(issuer="test-issuer")
98111
self.assertIsInstance(private_key, _RSAPrivateKey)
99-
self.assertEqual(key_id, 'test-2048')
112+
self.assertEqual(key_id, "test-2048")
100113

101114
def test_second_key(self):
102-
private_key, key_id = keys.get_private_key_and_key_id(issuer='test-issuer', key_id='test-1024')
115+
private_key, key_id = keys.get_private_key_and_key_id(issuer="test-issuer", key_id="test-1024")
103116
self.assertIsInstance(private_key, _RSAPrivateKey)
104-
self.assertEqual(key_id, 'test-1024')
117+
self.assertEqual(key_id, "test-1024")
105118

106119

107120
class TestGetPublicKeyAndKeyId(TestCase):
108121
def test_empty_keys(self):
109-
with self.assertRaisesMessage(InvalidKeyError, 'No keys defined for the given issuer'):
110-
keys.get_public_key_and_key_id(issuer='other-issuer')
122+
with self.assertRaisesMessage(InvalidKeyError, "No keys defined for the given issuer"):
123+
keys.get_public_key_and_key_id(issuer="other-issuer")
111124

112125
def test_first_key(self):
113-
public_key, key_id = keys.get_public_key_and_key_id(issuer='test-issuer')
126+
public_key, key_id = keys.get_public_key_and_key_id(issuer="test-issuer")
114127
self.assertIsInstance(public_key, _RSAPublicKey)
115-
self.assertEqual(key_id, 'test-2048')
128+
self.assertEqual(key_id, "test-2048")
116129

117130
def test_second_key(self):
118-
public_key, key_id = keys.get_public_key_and_key_id(issuer='test-issuer', key_id='test-1024')
131+
public_key, key_id = keys.get_public_key_and_key_id(issuer="test-issuer", key_id="test-1024")
119132
self.assertIsInstance(public_key, _RSAPublicKey)
120-
self.assertEqual(key_id, 'test-1024')
133+
self.assertEqual(key_id, "test-1024")

0 commit comments

Comments
 (0)