mirror of
https://github.com/django/django.git
synced 2025-08-04 02:48:35 +00:00
Refs #23919 -- Removed most of remaining six usage
Thanks Tim Graham for the review.
This commit is contained in:
parent
7b2f2e74ad
commit
2b281cc35e
180 changed files with 421 additions and 559 deletions
|
@ -16,7 +16,6 @@ from django.core.exceptions import ValidationError
|
|||
from django.core.files.storage import FileSystemStorage
|
||||
from django.db import models
|
||||
from django.utils._os import upath
|
||||
from django.utils.six.moves import range
|
||||
|
||||
temp_storage_dir = tempfile.mkdtemp()
|
||||
temp_storage = FileSystemStorage(temp_storage_dir)
|
||||
|
|
|
@ -17,7 +17,6 @@ from django.forms.models import (
|
|||
)
|
||||
from django.template import Context, Template
|
||||
from django.test import SimpleTestCase, TestCase, skipUnlessDBFeature
|
||||
from django.utils import six
|
||||
from django.utils._os import upath
|
||||
|
||||
from .models import (
|
||||
|
@ -2954,7 +2953,7 @@ class CustomMetaclass(ModelFormMetaclass):
|
|||
return new
|
||||
|
||||
|
||||
class CustomMetaclassForm(six.with_metaclass(CustomMetaclass, forms.ModelForm)):
|
||||
class CustomMetaclassForm(forms.ModelForm, metaclass=CustomMetaclass):
|
||||
pass
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue