Use isbytes and istext in the backported http.client module

edschofield · edschofield · commit 034d20c9d3b4 · 2013-10-06T11:45:19.000+11:00
diff --git a/future/standard_library/http/client.py b/future/standard_library/http/client.py
@@ -70,6 +70,7 @@
 
 from __future__ import (absolute_import, division,
                         print_function, unicode_literals)
+from future.utils import isbytes, istext
 from future.builtins import *
 
 import email.parser
@@ -84,6 +85,7 @@
 from urlparse import urlsplit
 from array import array
 import warnings
+import numbers
 
 __all__ = ["HTTPResponse", "HTTPConnection",
            "HTTPException", "NotConnected", "UnknownProtocol",
@@ -703,7 +705,7 @@ def getheader(self, name, default=None):
         if self.headers is None:
             raise ResponseNotReady()
         headers = self.headers.get_all(name) or default
-        if isinstance(headers, str) or not hasattr(headers, '__iter__'):
+        if istext(headers) or not hasattr(headers, '__iter__'):
             return headers
         else:
             return ', '.join(headers)
@@ -909,7 +911,7 @@ def _send_output(self, message_body=None):
         # If msg and message_body are sent in a single send() call,
         # it will avoid performance problems caused by the interaction
         # between delayed ack and the Nagle algorithm.
-        if isinstance(message_body, bytes):
+        if isbytes(message_body):
             msg += message_body
             message_body = None
         self.send(msg)
@@ -1105,7 +1107,7 @@ def _send_request(self, method, url, body, headers):
             self._set_content_length(body)
         for hdr, value in headers.items():
             self.putheader(hdr, value)
-        if isinstance(body, str):
+        if istext(body):
             # RFC 2616 Section 3.7.1 says that text default has a
             # default charset of iso-8859-1.
             body = body.encode('iso-8859-1')
