Ticket #12742: file_upload.diff

django/contrib/comments/forms.py

@@ -22 +22 @@
     timestamp     = forms.IntegerField(widget=forms.HiddenInput)
     security_hash = forms.CharField(min_length=40, max_length=40, widget=forms.HiddenInput)
 
-    def __init__(self, target_object, data=None, initial=None):
+    # use *args and **kwrgs as __init__args to allow super to work
+    # properly and handle e.g. request.FILES in post handler
+    def __init__(self, target_object, data=None, initial=None, *args, **kwargs):
         self.target_object = target_object
         if initial is None:
             initial = {}
         initial.update(self.generate_security_data())
-        super(CommentSecurityForm, self).__init__(data=data, initial=initial)
+        # super did not use *arts, and **kwargs,        
+        super(CommentSecurityForm, self).__init__(data=data, initial=initial, *args, **kwargs)
 
     def security_errors(self):
         """Return just those errors associated with security"""

django/contrib/comments/views/comments.py

@@ -67 +67 @@
     preview = "preview" in data
 
     # Construct the comment form
-    form = comments.get_form()(target, data=data)
+    # NEW: added files=request.FILES support
+    form = comments.get_form()(target, data=data, files=request.FILES)
 
     # Check security information
     if form.security_errors():

django/contrib/comments/templates/comments/form.html

@@ -1 +1 @@
 {% load comments i18n %}
-<form action="{% comment_form_target %}" method="post">{% csrf_token %}
+<form {% if form.is_multipart %} enctype="multipart/form-data" {% endif %} action="{% comment_form_target %}" method="post">{% csrf_token %}
   {% if next %}<input type="hidden" name="next" value="{{ next }}" />{% endif %}
   {% for field in form %}
     {% if field.is_hidden %}