diff --git a/example/anonymizer/base.py b/example/anonymizer/base.py index 967d9cf..57ebc0e 100644 --- a/example/anonymizer/base.py +++ b/example/anonymizer/base.py @@ -1,11 +1,10 @@ from __future__ import absolute_import -import datetime - from django.contrib.admin.models import LogEntry from django.contrib.auth.models import Group, Permission, User from django.contrib.contenttypes.models import ContentType from django.contrib.sessions.models import Session +from django.utils import timezone from dj_anonymizer import fields from dj_anonymizer.register_models import ( @@ -18,9 +17,9 @@ class UserAnonym(AnonymBase): email = fields.string('test_email_{seq}@preply.com', - seq_callback=datetime.datetime.now) + seq_callback=timezone.now) username = fields.string('test_username_{seq}@preply.com', - seq_callback=datetime.datetime.now) + seq_callback=timezone.now) first_name = fields.string('first name {seq}') last_name = fields.string('last name {seq}') password = fields.password('password') diff --git a/example/anonymizer/polls.py b/example/anonymizer/polls.py index 9ccf522..0aa9af4 100644 --- a/example/anonymizer/polls.py +++ b/example/anonymizer/polls.py @@ -1,6 +1,6 @@ from __future__ import absolute_import -import datetime +from django.utils import timezone from dj_anonymizer import fields from dj_anonymizer.register_models import ( @@ -13,7 +13,7 @@ class QuestionAnonym(AnonymBase): question_text = fields.string("John Doe {seq}") - pub_date = fields.function(datetime.datetime.now) + pub_date = fields.function(timezone.now) class Meta: pass diff --git a/example/project/settings.py b/example/project/settings.py index a69afaf..d0da708 100644 --- a/example/project/settings.py +++ b/example/project/settings.py @@ -63,8 +63,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True STATIC_URL = '/static/' diff --git a/example/project/urls.py b/example/project/urls.py index d52422e..5bcbcb8 100644 --- a/example/project/urls.py +++ b/example/project/urls.py @@ -1,7 +1,7 @@ -from django.conf.urls import url from django.contrib import admin +from django.urls import path urlpatterns = [ - url(r'^admin/', admin.site.urls), + path('admin/', admin.site.urls), ] diff --git a/tests/settings.py b/tests/settings.py index 8ebdb9f..455e72b 100644 --- a/tests/settings.py +++ b/tests/settings.py @@ -36,7 +36,6 @@ PASSWORD_HASHERS = [ 'django.contrib.auth.hashers.MD5PasswordHasher', - 'django.contrib.auth.hashers.UnsaltedMD5PasswordHasher', ] ROOT_URLCONF = 'test_app.urls' @@ -72,8 +71,6 @@ USE_I18N = True -USE_L10N = True - USE_TZ = True diff --git a/tests/test_anonym_field.py b/tests/test_anonym_field.py index bdd8c2a..08e4b7c 100644 --- a/tests/test_anonym_field.py +++ b/tests/test_anonym_field.py @@ -56,9 +56,6 @@ def test_string(field_value, seq_start, seq_step, seq_callback, seq_slugify, ('password', '111', 'md5', 'md5$111$d7fe5ea5ff97cc7c2c79e2df5eb7cf93', 'md5$111$d7fe5ea5ff97cc7c2c79e2df5eb7cf93'), - ('password', None, 'unsalted_md5', - '5f4dcc3b5aa765d61d8327deb882cf99', - '5f4dcc3b5aa765d61d8327deb882cf99'), ] ) def test_password(password, salt, hasher, expected_1, expected_2):