try to encode the post data for #103 separate when we know it's not multipart

Author: palewire

documentcloud/MultipartPostHandler.py

@@ -60,6 +60,24 @@
 doseq = 1
 
 
+class PostHandler(urllib.request.BaseHandler):
+    handler_order = urllib.request.HTTPHandler.handler_order - 10
+
+    def http_request(self, request):
+        try:
+            data = request.get_data()
+        except AttributeError:
+            data = request.data
+        if data is not None and type(data) != str:
+            data = urllib.parse.urlencode(data, doseq)
+            try:
+                request.add_data(data)
+            except AttributeError:
+                request.data = data
+        return request
+    https_request = http_request
+
+
 class MultipartPostHandler(urllib.request.BaseHandler):
     # needs to run first
     handler_order = urllib.request.HTTPHandler.handler_order - 10

documentcloud/__init__.py

@@ -24,7 +24,7 @@
 from .toolbox import credentials_required
 from .toolbox import CredentialsFailedError
 from dateutil.parser import parse as dateparser
-from .MultipartPostHandler import MultipartPostHandler
+from .MultipartPostHandler import MultipartPostHandler, PostHandler
 if six.PY3:
     import urllib.parse
     import urllib.error
@@ -52,7 +52,7 @@ def __init__(self, username, password, base_uri=None):
         self.username = username
         self.password = password
 
-    @retry(Exception, tries=3)
+    #@retry(Exception, tries=3)
     def _make_request(self, url, params=None, opener=None):
         """
         Configure a HTTP request, fire it off and return the response.
@@ -281,7 +281,7 @@ def upload(
         elif self.is_url(pdf):
             size = 0
             params = {'file': pdf}
-            opener = None  # URL uploads are lightweight, don't need MultiPart
+            opener = PostHandler  # URL uploads don't need MultiPart
         else:
             size = os.path.getsize(pdf)
             params = {'file': open(pdf, 'rb')}