Skip to content

Commit 59bf11b

Browse files
committed
Fix isort import sorting and flake8 linting issues
- Run isort to fix import sorting in all files - Remove unused imports from test_new_features.py - Add back required DeterministicEncryptedTextField import - All linting checks now pass: isort, black, flake8 - All 43 tests still passing with 89% coverage
1 parent 5f3603d commit 59bf11b

File tree

3 files changed

+12
-23
lines changed

3 files changed

+12
-23
lines changed

tink_fields/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,13 @@
1818
daead = None
1919

2020
from .fields import (
21+
DeterministicEncryptedCharField,
22+
DeterministicEncryptedDateField,
23+
DeterministicEncryptedDateTimeField,
24+
DeterministicEncryptedEmailField,
25+
DeterministicEncryptedField,
26+
DeterministicEncryptedIntegerField,
27+
DeterministicEncryptedTextField,
2128
EncryptedBinaryField,
2229
EncryptedCharField,
2330
EncryptedDateField,
@@ -26,13 +33,6 @@
2633
EncryptedField,
2734
EncryptedIntegerField,
2835
EncryptedTextField,
29-
DeterministicEncryptedField,
30-
DeterministicEncryptedTextField,
31-
DeterministicEncryptedCharField,
32-
DeterministicEncryptedEmailField,
33-
DeterministicEncryptedIntegerField,
34-
DeterministicEncryptedDateField,
35-
DeterministicEncryptedDateTimeField,
3636
)
3737

3838
aead.register()

tink_fields/fields.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
from __future__ import annotations
99

1010
from dataclasses import dataclass
11-
from django.utils.functional import cached_property
1211
from pathlib import Path
1312
from typing import Any, Optional
1413

1514
from django.conf import settings
1615
from django.core.exceptions import FieldError, ImproperlyConfigured
1716
from django.db import models
1817
from django.utils.encoding import force_bytes, force_str
18+
from django.utils.functional import cached_property
1919

2020
from tink import (
2121
JsonKeysetReader,

tink_fields/test/test_new_features.py

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,14 @@
11
"""Tests for new features from PR #2 implementation."""
22

3-
import tempfile
43
from unittest.mock import patch
54

65
from django.conf import settings
76
from django.core.exceptions import ImproperlyConfigured
8-
from django.db import connection, models
9-
from django.test import TestCase
7+
from django.db import connection
108

119
import pytest
1210

13-
from tink_fields.fields import (
14-
EncryptedBinaryField,
15-
DeterministicEncryptedField,
16-
DeterministicEncryptedTextField,
17-
DeterministicEncryptedCharField,
18-
DeterministicEncryptedEmailField,
19-
DeterministicEncryptedIntegerField,
20-
DeterministicEncryptedDateField,
21-
DeterministicEncryptedDateTimeField,
22-
DAEAD_AVAILABLE,
23-
)
11+
from tink_fields.fields import DAEAD_AVAILABLE, DeterministicEncryptedTextField
2412

2513

2614
@pytest.mark.django_db
@@ -64,9 +52,10 @@ class TestDeterministicEncryption:
6452

6553
def test_deterministic_text_field(self):
6654
"""Test deterministic text field encryption."""
67-
from tink_fields.test.models import DeterministicEncryptedText
6855
from django.db import connection
6956

57+
from tink_fields.test.models import DeterministicEncryptedText
58+
7059
test_value = "test value"
7160

7261
# Create two objects with same value

0 commit comments

Comments
 (0)