Skip to content

Updates for django 4.2 - include updates to test suite #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Updates for django 4.2 - include updates to test suite #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions fernet_fields/fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django.conf import settings
from django.core.exceptions import FieldError, ImproperlyConfigured
from django.db import models
from django.utils.encoding import force_bytes, force_text
from django.utils.encoding import force_bytes, force_str
from django.utils.functional import cached_property

from . import hkdf
Expand Down Expand Up @@ -74,7 +74,9 @@ def get_db_prep_save(self, value, connection):
def from_db_value(self, value, expression, connection, *args):
if value is not None:
value = bytes(value)
return self.to_python(force_text(self.fernet.decrypt(value)))
if value == b'':
return ''
return self.to_python(force_str(self.fernet.decrypt(value)))

@cached_property
def validators(self):
Expand Down
2 changes: 2 additions & 0 deletions fernet_fields/test/settings/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
SECRET_KEY = 'secret'

SILENCED_SYSTEM_CHECKS = ['1_7.W001']

USE_TZ = False
4 changes: 2 additions & 2 deletions fernet_fields/test/test_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from django.core.exceptions import FieldError, ImproperlyConfigured
from django.db import connection, models as dj_models
from django.utils.encoding import force_bytes, force_text
from django.utils.encoding import force_bytes, force_str
import pytest

import fernet_fields as fields
Expand Down Expand Up @@ -79,7 +79,7 @@ def test_insert(self, db, model, vals):
with connection.cursor() as cur:
cur.execute('SELECT value FROM %s' % model._meta.db_table)
data = [
force_text(field.fernet.decrypt(force_bytes(r[0])))
force_str(field.fernet.decrypt(force_bytes(r[0])))
for r in cur.fetchall()
]

Expand Down