From 0a70450e3f57e6478b9244f42aeebea744fec77c Mon Sep 17 00:00:00 2001
From: Nils Philippsen <nils@redhat.com>
Date: Wed, 19 Aug 2015 16:29:07 +0200
Subject: Python 3: Always encode params if passed as text types

Fixes tests.test_wsgiwrappers.test_wsgirequest_charset
---
 paste/fixture.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/paste/fixture.py b/paste/fixture.py
index df1c75d..363f119 100644
--- a/paste/fixture.py
+++ b/paste/fixture.py
@@ -226,8 +226,8 @@ class TestApp(object):
         if hasattr(params, 'items'):
             # Some other multi-dict like format
             params = urlencode(params.items())
-            if six.PY3:
-                params = params.encode('utf8')
+        if six.PY3 and isinstance(params, six.text_type):
+            params = params.encode('utf8')
         if upload_files:
             params = urlparse.parse_qsl(params, keep_blank_values=True)
             content_type, params = self.encode_multipart(
-- 
cgit v1.2.1