3 files changed, 29 insertions(+), 8 deletions(-)

A src/wiki/migrations/0003_auto_20200206_0327.py
M src/wiki/plugins/attachments/forms.py
M tests/core/test_accounts.py

@@ 0,0 1,28 @@
+# Generated by Django 3.0.3 on 2020-02-06 02:27
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('wiki', '0002_urlpath_moved_to'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='urlpath',
+            name='level',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='urlpath',
+            name='lft',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+        migrations.AlterField(
+            model_name='urlpath',
+            name='rght',
+            field=models.PositiveIntegerField(editable=False),
+        ),
+    ]

@@ 87,13 87,6 @@ class AttachmentArchiveForm(AttachmentForm):
         required=False,
     )
 
-    def __init__(self, *args, **kwargs):
-        super().__init__(*args, **kwargs)
-        ordered_fields = ["unzip_archive", "file"]
-        self.fields.keyOrder = ordered_fields + [
-            k for k in self.fields.keys() if k not in ordered_fields
-        ]
-
     def clean_file(self):
         uploaded_file = self.cleaned_data.get("file", None)
         if uploaded_file and self.cleaned_data.get("unzip_archive", False):

@@ 38,7 38,7 @@ class AccountUpdateTest(
 
         # save a new revision
         response = self.client.post(resolve_url("wiki:profile_update"), example_data)
-        self.assertContains(response, "Passwords don't match", status_code=200)
+        self.assertContains(response, "Passwords don", status_code=200)  # Django 2/3 output different escaped versions of single quote in don't
 
         # Now check that we don't succeed with unmatching passwords
         example_data = {