Merge branch 'brosner/master'

Conflicts:
	djangopypi/views.py

2 files changed, 14 insertions, 4 deletions

diff --git a/djangopypi/tests.py b/djangopypi/tests.py
index c6ebce2..2d8c305 100644
--- a/djangopypi/tests.py
+++ b/djangopypi/tests.py
@@ -1,6 +1,6 @@
 import unittest
 import StringIO
-from djangopypi.views import parse_weird_post_data
+from djangopypi.views import parse_distutils_request
 
 def create_post_data(action):
     data = {
@@ -67,12 +67,20 @@ def create_request(data):
     return body.getvalue()
 
 
+class MockRequest(object):
+
+    def __init__(self, raw_post_data):
+        self.raw_post_data = raw_post_data
+        self.META = {}
+
+
 class TestParseWeirdPostData(unittest.TestCase):
 
     def test_weird_post_data(self):
         data = create_post_data("submit")
         raw_post_data = create_request(data)
-        post, files = parse_weird_post_data(raw_post_data)
+        post, files = parse_distutils_request(MockRequest(raw_post_data))
+        print("post: %s files: %s" % (post, files))
         self.assertTrue(post)
 
         for key in post.keys():
diff --git a/djangopypi/views.py b/djangopypi/views.py
index 597598f..5fc2fec 100644
--- a/djangopypi/views.py
+++ b/djangopypi/views.py
@@ -15,12 +15,14 @@ from django.utils.datastructures import MultiValueDict
 from django.utils.translation import ugettext_lazy as _
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.contrib.auth import authenticate, login
+
 from registration.backends import get_backend
 from registration.forms import RegistrationForm
 
 from djangopypi.models import Project, Classifier, Release, UPLOAD_TO
 from djangopypi.forms import ProjectForm, ReleaseForm
-from djangopypi.http import HttpResponseNotImplemented, HttpResponseUnauthorized
+from djangopypi.http import HttpResponseUnauthorized
+from djangopypi.http import HttpResponseNotImplemented
 from djangopypi.utils import decode_fs
 
 
@@ -142,7 +144,7 @@ ACTIONS = {
 
 def simple(request, template_name="djangopypi/simple.html"):
     if request.method == "POST":
-        post_data, files = parse_distutils_request(request.raw_post_data)
+        post_data, files = parse_distutils_request(request)
         action_name = post_data.get(":action")
         if action_name not in ACTIONS:
             return HttpResponseNotImplemented(