Update cherrypy-18.6.1

This commit is contained in:
JonnyWong16 2021-10-14 21:17:18 -07:00
parent b3ae6bd695
commit ebffd124f6
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
57 changed files with 1269 additions and 1509 deletions

View file

@ -5,9 +5,7 @@ import os
import sys
import types
import uuid
import six
from six.moves.http_client import IncompleteRead
from http.client import IncompleteRead
import cherrypy
from cherrypy._cpcompat import ntou
@ -243,7 +241,7 @@ class RequestObjectTests(helper.CPWebCase):
def ifmatch(self):
val = cherrypy.request.headers['If-Match']
assert isinstance(val, six.text_type)
assert isinstance(val, str)
cherrypy.response.headers['ETag'] = val
return val
@ -251,7 +249,7 @@ class RequestObjectTests(helper.CPWebCase):
def get_elements(self, headername):
e = cherrypy.request.headers.elements(headername)
return '\n'.join([six.text_type(x) for x in e])
return '\n'.join([str(x) for x in e])
class Method(Test):