django-pfx 1.4.dev64__tar.gz → 1.4.dev68__tar.gz

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev64
+Version: 1.4.dev68
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/django_pfx.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: django-pfx
-Version: 1.4.dev64
+Version: 1.4.dev68
 Summary: Django PFX is a toolkit designed to streamline the development of RESTful APIs using the Django framework.
 Author: Hervé Martinet
 Author-email: herve.martinet@gmail.com

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/django_pfx.egg-info/SOURCES.txt

@@ -114,6 +114,8 @@ tests/models.py
 tests/urls.py
 tests/views.py
 tests/locale/fr/LC_MESSAGES/django.po
+tests/migrations/0001_initial.py
+tests/migrations/__init__.py
 tests/settings/__init__.py
 tests/settings/ci.py
 tests/settings/common.py
@@ -133,6 +135,7 @@ tests/tests/test_fields.py
 tests/tests/test_filters.py
 tests/tests/test_locale_api.py
 tests/tests/test_perm_tests.py
+tests/tests/test_permissions.py
 tests/tests/test_perms_api.py
 tests/tests/test_profiling_middleware.py
 tests/tests/test_settings.py

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/doc/source/authentication.md

@@ -9,20 +9,44 @@ including password validation and hashing.
 ## User Model
 
 You have the option to use the standard Django User with {class}`pfx.pfxcore.models.PFXUser`
-(which is a {class}`django.contrib.auth.models.User` with PFX required mixins),
-but you may prefer to use your own model. To do this, create your own user class.
+(which is a {class}`django.contrib.auth.models.User` with PFX required mixins):
+
+```python
+AUTH_USER_MODEL = 'pfxcore.PFXUser'
+```
+
+But you may prefer to use your own model. To do this, create your own user class.
+
+You have 2 options:
 
 ```python
 from pfx.pfxcore.models import AbstractPFXBaseUser
 
 class MyUser(AbstractPFXBaseUser):
+    # Equivalent of django.contrib.auth.models.AbstractBaseUser for PFX.
+    #
+    # Minimal user, you have to manage the USERNAME_FIELD by yourself,
+    # and you have to add django.contrib.auth.models.PermissionsMixin
+    # if you want to use the permission system.
     pass
 ```
 
+```python
+from pfx.pfxcore.models import AbstractPFXUser
+
+class MyUser(AbstractPFXUser):
+    # Equivalent of django.contrib.auth.models.AbstractUser for PFX.
+    #
+    # This is the same as using pfxcore.PFXUser, but you can add your
+    # custom fields.
+    pass
+
+```
+
 Then, define the model in your settings:
 
 ```python
-AUTH_USER_MODEL = "myapp.MyUser"
+AUTH_USER_MODEL = 'myapp.MyUser'
 ```
 
 ## Authentication Modes

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/manage.py

@@ -21,7 +21,8 @@ def main():
     cmd = len(sys.argv) > 1 and sys.argv[1]
     os.environ.setdefault(
         "DJANGO_SETTINGS_MODULE",
-        cmd == 'test' and "tests.settings.dev" or "pfx.settings.dev")
+        cmd in ('test', 'makemigrations') and
+        "tests.settings.dev" or "pfx.settings.dev")
     try:
         from django.core.management import execute_from_command_line
     except ImportError as exc:

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-11 12:51+0100\n"
+"POT-Creation-Date: 2025-01-21 14:22+0100\n"
 "PO-Revision-Date: 2021-06-22 23:31+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -259,27 +259,27 @@ msgstr "Un nouveau code d'authentification a été envoyé par e-mail."
 msgid "Invalid value for {filter} filter"
 msgstr "Valeur invalide pour le filtre {filter}"
 
-#: views/rest_views.py:235
+#: views/rest_views.py:242
 #, python-brace-format
 msgid "{obj} cannot be deleted because it is referenced by other objects."
 msgstr ""
 "{obj} ne peut pas être supprimé car il est référencé par d’autres objets."
 
-#: views/rest_views.py:329
+#: views/rest_views.py:342
 #, python-brace-format
 msgid "{model} {obj} created."
 msgstr "{model} {obj} créé."
 
-#: views/rest_views.py:330
+#: views/rest_views.py:343
 #, python-brace-format
 msgid "{model} {obj} updated."
 msgstr "{model} {obj} modifié."
 
-#: views/rest_views.py:1093
+#: views/rest_views.py:1141
 #, python-brace-format
 msgid "{model} {obj} deleted."
 msgstr "{model} {obj} supprimé."
 
-#: views/rest_views.py:1185 views/rest_views.py:1225
+#: views/rest_views.py:1240 views/rest_views.py:1280
 msgid "Unexpected storage error"
 msgstr "Erreur de stockage inattendue"

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/models/abstract_pfx_base_user.py

@@ -1,7 +1,9 @@
 from django.contrib.auth.models import AbstractBaseUser, AbstractUser
 
+from .pfx_models import PFXModelMixin
 
-class AbstractPFXBaseUser(AbstractBaseUser):
+
+class AbstractPFXBaseUser(PFXModelMixin, AbstractBaseUser):
     """The base abstract user for PFX."""
 
     class Meta:

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/models/pfx_user.py

@@ -1,10 +1,9 @@
 from django.contrib.auth.models import AbstractUser
 
 from .abstract_pfx_base_user import AbstractPFXUser
-from .pfx_models import PFXModelMixin
 
 
-class PFXUser(PFXModelMixin, AbstractPFXUser):
+class PFXUser(AbstractPFXUser):
     """The Django User with PFX mixins.
     """
 

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/shortcuts.py

@@ -121,3 +121,18 @@ def register_views(*views):
 
 def class_key(cls, *args):
     return f"{cls.__module__}.{cls.__name__}{''.join(f'.{a}' for a in args)}"
+
+
+def permissions(*perms):
+    from django.contrib.auth.models import Permission
+    pks = set()
+    for perm in perms:
+        app_label, codename = perm.split('.')
+        pks.add(Permission.objects.get(
+            codename=codename, content_type__app_label=app_label).pk)
+    return Permission.objects.filter(pk__in=pks)
+
+
+def model_permissions(model, *actions):
+    meta = model._meta
+    return {f"{meta.app_label}.{a}_{meta.model_name}" for a in actions}

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/views/__init__.py

@@ -15,13 +15,16 @@ from .rest_views import (
     DeleteRestViewMixin,
     DetailRestViewMixin,
     ListRestViewMixin,
+    MediaPermsRestViewMixin,
     MediaRestViewMixin,
     ModelBodyMixin,
     ModelMixin,
     ModelResponseMixin,
+    PermsRestView,
     RestView,
     SecuredRestViewMixin,
     SlugDetailRestViewMixin,
+    SlugPermsDetailRestViewMixin,
     UpdateRestViewMixin,
     resource_not_found,
 )

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/pfx/pfxcore/views/rest_views.py

@@ -34,7 +34,14 @@ from pfx.pfxcore.exceptions import (
 from pfx.pfxcore.fields import MediaField
 from pfx.pfxcore.http import JsonResponse
 from pfx.pfxcore.models import JSONReprMixin, UserFilteredQuerySetMixin
-from pfx.pfxcore.shortcuts import class_key, f, get_bool, get_int, get_object
+from pfx.pfxcore.shortcuts import (
+    class_key,
+    f,
+    get_bool,
+    get_int,
+    get_object,
+    model_permissions,
+)
 from pfx.pfxcore.storage.s3_storage import StorageException
 
 from . import parameters
@@ -242,6 +249,12 @@ class ModelMixin():
         return cls.tags or [
             Tag(str(cls.model._meta.verbose_name))]
 
+    @classmethod
+    def get_model_perms(cls, actions):
+        """Get the model permission name for the action.
+        """
+        return model_permissions(cls.model, actions)
+
 
 class ModelResponseMixin(ModelMixin):
     """Extension of :class:`ModelMixin` to manage object responses."""
@@ -894,6 +907,13 @@ class ListRestViewMixin(ModelResponseMixin):
             cls.meta_list_schema, cls.model_list_schema]
 
 
+class ListPermsRestViewMixin(ListRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_list_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class DetailRestViewMixin(ModelResponseMixin):
     """Extension mixin to add a get detail route."""
 
@@ -917,6 +937,13 @@ class DetailRestViewMixin(ModelResponseMixin):
         return self.response(obj)
 
 
+class DetailPermsRestViewMixin(DetailRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class SlugDetailRestViewMixin(ModelResponseMixin):
     """Extension mixin to add a get detail by slug route."""
 
@@ -944,6 +971,13 @@ class SlugDetailRestViewMixin(ModelResponseMixin):
         return self.response(obj)
 
 
+class SlugPermsDetailRestViewMixin(SlugDetailRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def get_by_slug_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class CreateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
     """Extension mixin to add create route."""
 
@@ -1013,6 +1047,13 @@ class CreateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return self._post(*args, **kwargs)
 
 
+class CreatePermsRestViewMixin(CreateRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def post_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('add'))
+
+
 class UpdateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
     """Extension mixin to add create route."""
 
@@ -1068,6 +1109,13 @@ class UpdateRestViewMixin(ModelBodyMixin, ModelResponseMixin):
         return self._put(id, *args, **kwargs)
 
 
+class UpdatePermsRestViewMixin(UpdateRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def put_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('change'))
+
+
 class DeleteRestViewMixin(ModelMixin):
     """Extension mixin to add delete route."""
 
@@ -1111,6 +1159,13 @@ class DeleteRestViewMixin(ModelMixin):
         return self._delete(id, *args, **kwargs)
 
 
+class DeletePermsRestViewMixin(DeleteRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def delete_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('delete'))
+
+
 class MediaRestViewMixin(ModelMixin):
     """Extension mixin to manage media fields."""
 
@@ -1228,6 +1283,16 @@ class MediaRestViewMixin(ModelMixin):
         return JsonResponse(dict(url=url))
 
 
+class MediaPermsRestViewMixin(MediaRestViewMixin):
+    """Extension mixin to check permissions."""
+
+    def field_media_upload_url_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('change'))
+
+    def field_media_get_perm(self, *args, **kwargs):
+        return self.request.user.has_perm(*self.get_model_perms('view'))
+
+
 class SecuredRestViewMixin(View):
     """A view mixin to manage service permissions.
 
@@ -1409,3 +1474,13 @@ class RestView(
         DeleteRestViewMixin,
         BaseRestView):
     pass
+
+
+class PermsRestView(
+        ListPermsRestViewMixin,
+        DetailPermsRestViewMixin,
+        CreatePermsRestViewMixin,
+        UpdatePermsRestViewMixin,
+        DeletePermsRestViewMixin,
+        BaseRestView):
+    pass

django_pfx-1.4.dev68/tests/migrations/0001_initial.py

@@ -0,0 +1,132 @@
+# Generated by Django 4.2.17 on 2025-01-21 04:24
+# flake8: noqa
+
+import django.contrib.auth.models
+import django.contrib.auth.validators
+import django.db.models.deletion
+import django.utils.timezone
+from django.db import migrations, models
+
+import pfx.pfxcore.fields
+import pfx.pfxcore.models.cache_mixins
+import pfx.pfxcore.models.not_null_fields
+import pfx.pfxcore.models.pfx_models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('auth', '0012_alter_user_first_name_max_length'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Author',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('first_name', models.CharField(max_length=30, verbose_name='First Name')),
+                ('last_name', models.CharField(max_length=30, verbose_name='Last Name')),
+                ('slug', models.SlugField(unique=True, verbose_name='Slug')),
+                ('gender', models.CharField(choices=[('male', 'Male'), ('female', 'Female')], default='male', max_length=10, verbose_name='Gender')),
+                ('science_fiction', models.BooleanField(default=False, verbose_name='Science Fiction')),
+                ('created_at', models.DateField(auto_now_add=True, verbose_name='Created at')),
+                ('create_comment', pfx.pfxcore.models.not_null_fields.NotNullCharField(blank=True, max_length=255, verbose_name='Create comment')),
+                ('update_comment', pfx.pfxcore.models.not_null_fields.NotNullCharField(blank=True, max_length=255, verbose_name='Update comment')),
+                ('website', pfx.pfxcore.models.not_null_fields.NotNullURLField(blank=True, max_length=255, verbose_name='Website')),
+            ],
+            options={
+                'verbose_name': 'Author',
+                'verbose_name_plural': 'Authors',
+                'ordering': ['last_name', 'first_name', 'pk'],
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheableMixin, pfx.pfxcore.models.pfx_models.JSONReprMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='BookType',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30, verbose_name='Name')),
+                ('slug', models.SlugField(verbose_name='Slug')),
+            ],
+            options={
+                'verbose_name': 'Book Type',
+                'verbose_name_plural': 'Book Types',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheDependsMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='TestModel',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=30, verbose_name='Name')),
+            ],
+            options={
+                'verbose_name': 'TestModel',
+                'verbose_name_plural': 'TestModels',
+                'ordering': ['name', 'pk'],
+            },
+            bases=(pfx.pfxcore.models.pfx_models.JSONReprMixin, models.Model),
+        ),
+        migrations.CreateModel(
+            name='Book',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100, verbose_name='Name')),
+                ('pub_date', models.DateField(verbose_name='Pub Date')),
+                ('created_at', models.DateField(auto_now_add=True, verbose_name='Created at')),
+                ('pages', models.IntegerField(blank=True, null=True, verbose_name='Pages')),
+                ('rating', models.FloatField(blank=True, null=True, verbose_name='Rating')),
+                ('reference', models.CharField(blank=True, max_length=30, null=True, verbose_name='Reference')),
+                ('cover', pfx.pfxcore.fields.MediaField(blank=True, default=dict, max_length=255, verbose_name='Cover')),
+                ('read_time', pfx.pfxcore.fields.MinutesDurationField(blank=True, null=True, verbose_name='Read Time')),
+                ('author', models.ForeignKey(on_delete=django.db.models.deletion.RESTRICT, related_name='books', to='tests.author', verbose_name='Author')),
+                ('type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='books', to='tests.booktype', verbose_name='Book Type')),
+            ],
+            options={
+                'verbose_name': 'Book',
+                'verbose_name_plural': 'Books',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheDependsMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+        ),
+        migrations.AddField(
+            model_name='author',
+            name='types',
+            field=models.ManyToManyField(related_name='authors', to='tests.booktype', verbose_name='Types'),
+        ),
+        migrations.CreateModel(
+            name='User',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('password', models.CharField(max_length=128, verbose_name='password')),
+                ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+                ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+                ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+                ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+                ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+                ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+                ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+                ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+                ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+                ('otp_secret_token', models.CharField(blank=True, max_length=32, null=True, unique=True, verbose_name='OTP secret token')),
+                ('otp_secret_token_tmp', models.CharField(blank=True, max_length=32, null=True, verbose_name='Temporary OTP secret token')),
+                ('hotp_count', models.IntegerField(default=0, verbose_name='HOTP count')),
+                ('hotp_expiry', models.DateTimeField(default=django.utils.timezone.now, verbose_name='HOTP expiry')),
+                ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
+            ],
+            options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
+            },
+            bases=(pfx.pfxcore.models.cache_mixins.CacheableMixin, pfx.pfxcore.models.pfx_models.PFXModelMixin, models.Model),
+            managers=[
+                ('objects', django.contrib.auth.models.UserManager()),
+            ],
+        ),
+        migrations.AddConstraint(
+            model_name='book',
+            constraint=pfx.pfxcore.models.pfx_models.UniqueConstraint(fields=('author', 'name'), message='%(name)s already exists for %(author)s', name='book_unique_author_and_name'),
+        ),
+    ]

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/tests/models.py

@@ -1,4 +1,3 @@
-from django.contrib.auth.base_user import BaseUserManager
 from django.core.mail import send_mail
 from django.db import models
 from django.db.models import Q
@@ -8,7 +7,7 @@ from django.utils.translation import gettext_lazy as _
 from pfx.pfxcore.decorator import rest_property
 from pfx.pfxcore.fields import MediaField, MinutesDurationField
 from pfx.pfxcore.models import (
-    AbstractPFXBaseUser,
+    AbstractPFXUser,
     CacheableMixin,
     CacheDependsMixin,
     JSONReprMixin,
@@ -21,61 +20,8 @@ from pfx.pfxcore.models import (
 )
 
 
-class UserManager(BaseUserManager):
-    def create_user(
-            self, username, email, password, first_name, last_name,
-            is_superuser=False):
-        """
-        Creates and saves a User with the given email and password.
-        """
-        if not email:
-            raise ValueError('Users must have an email address')
-
-        user = self.model(
-            email=self.normalize_email(email),
-            username=username,
-            first_name=first_name,
-            last_name=last_name,
-            is_superuser=is_superuser
-        )
-
-        user.set_password(password)
-        user.save(using=self._db)
-        return user
-
-    def create_superuser(
-            self, username, email, password, first_name, last_name):
-        return self.create_user(
-            username, email, password, first_name, last_name,
-            is_superuser=True)
-
-
-class User(CacheableMixin, JSONReprMixin, OtpUserMixin, AbstractPFXBaseUser):
-    username = models.CharField(
-        'username',
-        max_length=150,
-        unique=True,
-        error_messages={
-            'unique': "A user with that username already exists.",
-        },
-    )
-    first_name = models.CharField('first name', max_length=150, blank=True)
-    last_name = models.CharField('last name', max_length=150, blank=True)
-    email = models.EmailField('email address', blank=True)
-    is_active = models.BooleanField(
-        'active',
-        default=True,
-    )
-    is_superuser = models.BooleanField(
-        'is_superuser',
-        default=False,
-    )
-
-    EMAIL_FIELD = 'email'
-    USERNAME_FIELD = 'username'
-    REQUIRED_FIELDS = ['email']
-
-    objects = UserManager()
+class User(CacheableMixin, OtpUserMixin, AbstractPFXUser):
+    """Default user for tests."""
 
     class Meta:
         verbose_name = 'user'
@@ -220,3 +166,16 @@ class Book(CacheDependsMixin, PFXModelMixin, models.Model):
             type: string
         """
         return super().json_repr(author_name=str(self.author), **values)
+
+
+class TestModel(JSONReprMixin, models.Model):
+
+    name = models.CharField("Name", max_length=30)
+
+    class Meta:
+        verbose_name = "TestModel"
+        verbose_name_plural = "TestModels"
+        ordering = ['name', 'pk']
+
+    def __str__(self):
+        return self.name

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/tests/tests/__init__.py

@@ -10,6 +10,7 @@ from .test_fields import FieldsTest
 from .test_filters import FiltersTest
 from .test_locale_api import LocaleAPITest
 from .test_perm_tests import PermTestsTest
+from .test_permissions import TestPermissions
 from .test_perms_api import PermsAPITest
 from .test_profiling_middleware import ProfilingMiddlewareTest
 from .test_settings import TestSettings

{django_pfx-1.4.dev64 → django_pfx-1.4.dev68}/tests/tests/test_client.py

@@ -1,4 +1,3 @@
-from django.db import models
 from django.http import HttpResponse
 from django.test import TestCase
 from django.test.utils import override_settings
@@ -7,23 +6,9 @@ from django.urls import include, path
 from pfx.pfxcore import register_views
 from pfx.pfxcore.decorator import rest_api, rest_view
 from pfx.pfxcore.http import JsonResponse
-from pfx.pfxcore.models import JSONReprMixin
 from pfx.pfxcore.test import APIClient, TestAssertMixin
 from pfx.pfxcore.views import RestView
-from tests.models import User
-
-
-class TestModel(JSONReprMixin, models.Model):
-
-    name = models.CharField("Name", max_length=30)
-
-    class Meta:
-        verbose_name = "TestModel"
-        verbose_name_plural = "TestModels"
-        ordering = ['name', 'pk']
-
-    def __str__(self):
-        return self.name
+from tests.models import TestModel, User
 
 
 @rest_view("/test")