Refactor InputFile to use urllib3 (python-telegram-bot#328)

rahiel · rahiel · commit 4abcff76b052 · 2017-02-05T23:19:53.000+01:00
diff --git a/telegram/inputfile.py b/telegram/inputfile.py
@@ -29,7 +29,6 @@
 import imghdr
 import mimetypes
 import os
-import sys
 
 from telegram import TelegramError
 
@@ -102,51 +101,6 @@ def content_type(self):
         """
         return 'multipart/form-data; boundary=%s' % self.boundary
 
-    def to_form(self):
-        """
-        Returns:
-            str:
-        """
-        form = []
-        form_boundary = '--' + self.boundary
-
-        # Add data fields
-        for name in iter(self.data):
-            value = self.data[name]
-            form.extend([
-                form_boundary, 'Content-Disposition: form-data; name="%s"' % name, '', str(value)
-            ])
-
-        # Add input_file to upload
-        form.extend([
-            form_boundary, 'Content-Disposition: form-data; name="%s"; filename="%s"' %
-            (self.input_name,
-             self.filename), 'Content-Type: %s' % self.mimetype, '', self.input_file_content
-        ])
-
-        form.append('--' + self.boundary + '--')
-        form.append('')
-
-        return self._parse(form)
-
-    @staticmethod
-    def _parse(form):
-        """
-        Returns:
-            str:
-        """
-        if sys.version_info > (3,):
-            # on Python 3 form needs to be byte encoded
-            encoded_form = []
-            for item in form:
-                try:
-                    encoded_form.append(item.encode())
-                except AttributeError:
-                    encoded_form.append(item)
-
-            return b'\r\n'.join(encoded_form)
-        return '\r\n'.join(form)
-
     @staticmethod
     def is_image(stream):
         """Check if the content file is an image by analyzing its headers.
diff --git a/telegram/utils/request.py b/telegram/utils/request.py
@@ -31,7 +31,7 @@
 from urllib3.connection import HTTPConnection
 from urllib3.util.timeout import Timeout
 
-from telegram import (InputFile, TelegramError)
+from telegram import InputFile, TelegramError
 from telegram.error import (Unauthorized, NetworkError, TimedOut, BadRequest, ChatMigrated,
                             RetryAfter, InvalidToken)
 
@@ -223,7 +223,11 @@ def post(self, url, data, timeout=None):
         if InputFile.is_inputfile(data):
             data = InputFile(data)
             result = self._request_wrapper(
-                'POST', url, body=data.to_form(), headers=data.headers, **urlopen_kwargs)
+                'POST',
+                url,
+                body=data.input_file_content,
+                headers={'Content-Type': data.mimetype},
+                **urlopen_kwargs)
         else:
             data = json.dumps(data)
             result = self._request_wrapper(
