From ccae49813ab0b3f38f40b9d27f54d0e15004aad2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gra=C3=B1a?= <dangra@gmail.com>
Date: Fri, 1 Aug 2014 02:33:24 -0300
Subject: [PATCH] PY3: port scrapy/utils/httpobj.py

---
 scrapy/http/request/__init__.py | 5 +++--
 tests/py3-ignores.txt           | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scrapy/http/request/__init__.py b/scrapy/http/request/__init__.py
index 609a0d433..f4282459f 100644
--- a/scrapy/http/request/__init__.py
+++ b/scrapy/http/request/__init__.py
@@ -7,6 +7,7 @@ See documentation in docs/topics/request-response.rst
 
 import copy
 
+import six
 from w3lib.url import safe_url_string
 
 from scrapy.http.headers import Headers
@@ -50,7 +51,7 @@ class Request(object_ref):
     def _set_url(self, url):
         if isinstance(url, str):
             self._url = escape_ajax(safe_url_string(url))
-        elif isinstance(url, unicode):
+        elif isinstance(url, six.text_type):
             if self.encoding is None:
                 raise TypeError('Cannot convert unicode url - %s has no encoding' %
                     type(self).__name__)
@@ -68,7 +69,7 @@ class Request(object_ref):
     def _set_body(self, body):
         if isinstance(body, str):
             self._body = body
-        elif isinstance(body, unicode):
+        elif isinstance(body, six.text_type):
             if self.encoding is None:
                 raise TypeError('Cannot convert unicode body - %s has no encoding' %
                     type(self).__name__)
diff --git a/tests/py3-ignores.txt b/tests/py3-ignores.txt
index 5905eaa55..8cb5d0d8a 100644
--- a/tests/py3-ignores.txt
+++ b/tests/py3-ignores.txt
@@ -64,7 +64,6 @@ tests/test_squeue.py
 tests/test_stats.py
 tests/test_toplevel.py
 tests/test_utils_defer.py
-tests/test_utils_httpobj.py
 tests/test_utils_iterators.py
 tests/test_utils_jsonrpc.py
 tests/test_utils_misc/__init__.py