From 674ae7718bc06a8b8c8b658075bf82c8198fb632 Mon Sep 17 00:00:00 2001
From: Cyril Roelandt <cyril.roelandt@enovance.com>
Date: Tue, 18 Mar 2014 12:49:12 +0100
Subject: Python 3: use new names of standard library modules

Use "try/except ImportError" to try Python 2 and Python 3 names.
---
 paste/proxy.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'paste/proxy.py')

diff --git a/paste/proxy.py b/paste/proxy.py
index 155128f..a33efbc 100644
--- a/paste/proxy.py
+++ b/paste/proxy.py
@@ -29,9 +29,9 @@ TODO:
   
 """
 
-import httplib
-import urlparse
-import urllib
+from six.moves import http_client as httplib
+from six.moves.urllib import parse as urlparse
+from six.moves.urllib.parse import quote
 
 from paste import httpexceptions
 from paste.util.converters import aslist
@@ -101,7 +101,7 @@ class Proxy(object):
         else:
             body = ''
             
-        path_info = urllib.quote(environ['PATH_INFO'])
+        path_info = quote(environ['PATH_INFO'])
         if self.path:            
             request_path = path_info
             if request_path and request_path[0] == '/':
@@ -227,7 +227,7 @@ class TransparentProxy(object):
         
         path = (environ.get('SCRIPT_NAME', '')
                 + environ.get('PATH_INFO', ''))
-        path = urllib.quote(path)
+        path = quote(path)
         if 'QUERY_STRING' in environ:
             path += '?' + environ['QUERY_STRING']
         conn.request(environ['REQUEST_METHOD'],
-- 
cgit v1.2.1