summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/contrib/auth/migrations/0001_initial.py2
-rw-r--r--django/contrib/contenttypes/migrations/0001_initial.py2
-rw-r--r--django/contrib/redirects/migrations/0001_initial.py2
-rw-r--r--django/db/migrations/serializer.py5
4 files changed, 6 insertions, 5 deletions
diff --git a/django/contrib/auth/migrations/0001_initial.py b/django/contrib/auth/migrations/0001_initial.py
index 5ab80b64e0..c1fbe9a613 100644
--- a/django/contrib/auth/migrations/0001_initial.py
+++ b/django/contrib/auth/migrations/0001_initial.py
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
],
options={
'ordering': ('content_type__app_label', 'content_type__model', 'codename'),
- 'unique_together': set([('content_type', 'codename')]),
+ 'unique_together': {('content_type', 'codename')},
'verbose_name': 'permission',
'verbose_name_plural': 'permissions',
},
diff --git a/django/contrib/contenttypes/migrations/0001_initial.py b/django/contrib/contenttypes/migrations/0001_initial.py
index 9bafd098e9..e55c320d80 100644
--- a/django/contrib/contenttypes/migrations/0001_initial.py
+++ b/django/contrib/contenttypes/migrations/0001_initial.py
@@ -29,6 +29,6 @@ class Migration(migrations.Migration):
),
migrations.AlterUniqueTogether(
name='contenttype',
- unique_together=set([('app_label', 'model')]),
+ unique_together={('app_label', 'model')},
),
]
diff --git a/django/contrib/redirects/migrations/0001_initial.py b/django/contrib/redirects/migrations/0001_initial.py
index fb0462f52c..5acf8c9be7 100644
--- a/django/contrib/redirects/migrations/0001_initial.py
+++ b/django/contrib/redirects/migrations/0001_initial.py
@@ -30,7 +30,7 @@ class Migration(migrations.Migration):
],
options={
'ordering': ('old_path',),
- 'unique_together': set([('site', 'old_path')]),
+ 'unique_together': {('site', 'old_path')},
'db_table': 'django_redirect',
'verbose_name': 'redirect',
'verbose_name_plural': 'redirects',
diff --git a/django/db/migrations/serializer.py b/django/db/migrations/serializer.py
index 9c135a5fa9..4df3776e54 100644
--- a/django/db/migrations/serializer.py
+++ b/django/db/migrations/serializer.py
@@ -244,8 +244,9 @@ class SequenceSerializer(BaseSequenceSerializer):
class SetSerializer(BaseSequenceSerializer):
def _format(self):
- # Don't use the literal "{%s}" as it doesn't support empty set
- return "set([%s])"
+ # Serialize as a set literal except when value is empty because {}
+ # is an empty dict.
+ return '{%s}' if self.value else 'set(%s)'
class SettingsReferenceSerializer(BaseSerializer):