Address some review comments

Change-Id: Iacff8a7d7e37557b9a7694ac2df0cfc6b3492024
Related-Change: Ia5815602d05925c5de110accc4dfb1368203bd8d

1 files changed, 3 insertions, 10 deletions

diff --git a/swift/common/request_helpers.py b/swift/common/request_helpers.py
index a09ee26c1..78fe771f4 100644
--- a/swift/common/request_helpers.py
+++ b/swift/common/request_helpers.py
@@ -55,7 +55,7 @@ def get_param(req, name, default=None):
     :param req: request object
     :param name: parameter name
     :param default: result to return if the parameter is not found
-    :returns: HTTP request parameter value
+    :returns: HTTP request parameter value, as a native string
               (in py2, as UTF-8 encoded str, not unicode object)
     :raises HTTPBadRequest: if param not valid UTF-8 byte sequence
     """
@@ -70,15 +70,8 @@ def get_param(req, name, default=None):
                     body='"%s" parameter not valid UTF-8' % name)
     else:
         if value:
-            try:
-                if isinstance(value, six.text_type):
-                    value = value.encode('latin1')
-            except UnicodeEncodeError:
-                # This happens, remarkably enough, when WSGI string is not
-                # a valid latin-1, and passed through parse_qsl().
-                raise HTTPBadRequest(
-                    request=req, content_type='text/plain',
-                    body='"%s" parameter not valid UTF-8' % name)
+            # req.params is a dict of WSGI strings, so encoding will succeed
+            value = value.encode('latin1')
             try:
                 # Ensure UTF8ness since we're at it
                 value = value.decode('utf8')