Ticket #19905: 19905-1.diff

django/contrib/formtools/tests/wizard/namedwizardtests/forms.py

@@ -50 +50 @@
 
 
 class SessionContactWizard(ContactWizard):
-    storage_name = 'django.contrib.formtools.wizard.storage.session.SessionStorage'
+    storage_name = 'django.contrib.formtools.tests.wizard.storage.WrappedSessionStorage'
 
 
 class CookieContactWizard(ContactWizard):
-    storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage'
+    storage_name = 'django.contrib.formtools.tests.wizard.storage.WrappedCookieStorage'

django/contrib/formtools/tests/wizard/namedwizardtests/tests.py

@@ -9 +9 @@
 
 from django.contrib.formtools.wizard.views import (NamedUrlSessionWizardView,
                                                    NamedUrlCookieWizardView)
+from django.contrib.formtools.tests.wizard.storage import TrackingFilesMixin
 from django.contrib.formtools.tests.wizard.test_forms import get_request, Step1, Step2
 
 
@@ -19 +20 @@
         self.testuser, created = User.objects.get_or_create(username='testuser1')
         self.wizard_step_data[0]['form1-user'] = self.testuser.pk
 
+    def tearDown(self):
+        for uploaded_file in TrackingFilesMixin.open_files:
+            uploaded_file.close()
+        TrackingFilesMixin.open_files = []
+
     def test_initial_call(self):
         response = self.client.get(reverse('%s_start' % self.wizard_urlname))
         self.assertEqual(response.status_code, 302)

django/contrib/formtools/tests/wizard/storage.py

@@ -5 +5 @@
 from django.conf import settings
 
 from django.contrib.auth.models import User
+from django.contrib.formtools.wizard.storage.cookie import CookieStorage
+from django.contrib.formtools.wizard.storage.session import SessionStorage
 
 
 def get_request():
@@ -85 +87 @@
         storage.extra_data['test'] = True
 
         self.assertTrue('test' in storage.extra_data)
+
+
+class TrackingFilesMixin(object):
+    """
+    Keep track of open UploadedFiles to be able to properly close them to
+    silence ResourceWarning on Python 3.
+    """
+    open_files = []
+    def get_step_files(self, step):
+        files = super(TrackingFilesMixin, self).get_step_files(step)
+        if files is not None:
+            self.open_files.extend(list(files.values()))
+        return files
+
+
+class WrappedCookieStorage(TrackingFilesMixin, CookieStorage):
+    pass
+
+
+class WrappedSessionStorage(TrackingFilesMixin, SessionStorage):
+    pass

django/contrib/formtools/tests/wizard/wizardtests/forms.py

@@ -65 +65 @@
 
 
 class SessionContactWizard(ContactWizard):
-    storage_name = 'django.contrib.formtools.wizard.storage.session.SessionStorage'
+    storage_name = 'django.contrib.formtools.tests.wizard.storage.WrappedSessionStorage'
 
 
 class CookieContactWizard(ContactWizard):
-    storage_name = 'django.contrib.formtools.wizard.storage.cookie.CookieStorage'
+    storage_name = 'django.contrib.formtools.tests.wizard.storage.WrappedCookieStorage'

django/contrib/formtools/tests/wizard/wizardtests/tests.py

@@ -11 +11 @@
 from django.contrib.formtools.wizard.views import CookieWizardView
 from django.utils._os import upath
 from django.contrib.formtools.tests.models import Poet, Poem
+from django.contrib.formtools.tests.wizard.storage import TrackingFilesMixin
 
 
 class UserForm(forms.ModelForm):
@@ -30 +31 @@
         self.testuser, created = User.objects.get_or_create(username='testuser1')
         self.wizard_step_data[0]['form1-user'] = self.testuser.pk
 
+    def tearDown(self):
+        for uploaded_file in TrackingFilesMixin.open_files:
+            uploaded_file.close()
+        TrackingFilesMixin.open_files = []
+
     def test_initial_call(self):
         response = self.client.get(self.wizard_url)
         wizard = response.context['wizard']