fix username password test for py3

kiddx01 · Feb 4, 2015 · 039dc0a · 039dc0a
1 parent 8f9588d
commit 039dc0a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -9,7 +9,7 @@ services:
     - rabbitmq
 install:
     - pip install --allow-all-external -r requirements.txt
-    - pip install coveralls httpbin pyproxy
+    - pip install coveralls httpbin pyproxy>=0.1.6
     - pip install -e .
 script:
     - coverage run setup.py test

diff --git a/pyspider/fetcher/tornado_fetcher.py b/pyspider/fetcher/tornado_fetcher.py
@@ -207,10 +207,10 @@ def http_fetch(self, url, task, callback):
                 proxy_string = 'http://' + proxy_string
             proxy_splited = urlsplit(proxy_string)
             if proxy_splited.username:
-                fetch['proxy_username'] = utils.utf8(proxy_splited.username)
+                fetch['proxy_username'] = proxy_splited.username
             if proxy_splited.password:
-                fetch['proxy_password'] = utils.utf8(proxy_splited.password)
-            fetch['proxy_host'] = utils.utf8(proxy_splited.hostname)
+                fetch['proxy_password'] = proxy_splited.password
+            fetch['proxy_host'] = proxy_splited.hostname
             fetch['proxy_port'] = proxy_splited.port or 8080
 
         # etag

diff --git a/tox.ini b/tox.ini
@@ -5,7 +5,7 @@ deps =
     -rrequirements.txt
     coverage
     httpbin
-    pyproxy>=0.1.4
+    pyproxy>=0.1.6
 install_command = pip install --allow-all-external {opts} {packages}
 commands =
     coverage erase