Commits

Michael Merickel  committed df06fbc Merge

merged changes from tip

  • Participants
  • Parent commits 657700b, 1361c9d

Comments (0)

Files changed (2)

File webob/acceptparse.py

                 else:
                     result.append(item)
             other = ', '.join(result)
-        other = six.binary_type(other)
+        other = other.encode('UTF-8')
         my_value = self.header_value
         if reversed:
             other, my_value = my_value, other

File webob/request.py

 
     def _update_get(self, vars, key=None, value=None):
         env = self.environ
-        qs = urllib.parse.urlencode(vars.items())
+        items = list(vars.items())
+        qs = urllib.parse.urlencode(items)
         env['QUERY_STRING'] = qs
         env['webob._parsed_query_vars'] = (vars, qs)