Some cleanup

Author: hirunatan

testing/media/testfile/the_file.png

@@ -13,9 +13,9 @@ def __init__(self, *args, **kwargs):
 
     def clean(self, *args, **kwargs):        
         data = super(ValidatedFileField, self).clean(*args, **kwargs)
+        file = data.file
 
         if self.content_types:
-            file = data.file
             content_type_headers = getattr(file, 'content_type', '')
 
             mg = magic.Magic(mime = True)

validatedfile/models.py

@@ -26,7 +26,6 @@ def test_create_instance_with_file(self):
 
         self._check_file_url(instance.the_file, 'the_file.png')
 
-        from ipdb import set_trace; set_trace()
         instance.the_file.delete()
         instance.delete()
 
@@ -111,6 +110,18 @@ def test_form_no_validate(self):
         instance.delete()
 
 
+    def test_form_null_file(self):
+        form = TestModelNoValidateForm(data = {}, files = {})
+        self.assertTrue(form.is_valid())
+        instance = form.save()
+
+        self.assertEqual(instance.the_file, None)
+
+        instance.delete()
+
+
+    # Utilities
+
     def _get_sample_file(self, filename):
         path = os.path.join(self.SAMPLE_FILES_PATH, filename)
         return open(path)

validatedfile/tests/__init__.py

@@ -1,6 +1,5 @@
 from django.db import models
 from validatedfile.models import ValidatedFileField
-from ..models import *
 
 class TestModel(models.Model):
     the_file = ValidatedFileField(