diff -urN www/py-cherrypy/Makefile www/py-cherrypy/Makefile --- www/py-cherrypy/Makefile 2020-08-17 10:27:26.694697000 +0800 +++ www/py-cherrypy/Makefile 2020-10-16 09:39:07.188967000 +0800 @@ -3,6 +3,7 @@ PORTNAME= cherrypy PORTVERSION= 17.4.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -44,6 +45,11 @@ .endif .include + +.if ${PYTHON_REL} >= 3800 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cherrypy_lib_sessions.py +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-setup.py +.endif .if ${PYTHON_REL} < 3800 RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR} diff -urN www/py-cherrypy/files/extra-patch-cherrypy_lib_sessions.py www/py-cherrypy/files/extra-patch-cherrypy_lib_sessions.py --- www/py-cherrypy/files/extra-patch-cherrypy_lib_sessions.py 1970-01-01 08:00:00.000000000 +0800 +++ www/py-cherrypy/files/extra-patch-cherrypy_lib_sessions.py 2020-10-16 09:33:09.743302000 +0800 @@ -0,0 +1,20 @@ +--- cherrypy/lib/sessions.py.orig 2020-10-16 01:25:39 UTC ++++ cherrypy/lib/sessions.py +@@ -109,7 +109,7 @@ import binascii + + import six + from six.moves import cPickle as pickle +-import contextlib2 ++import contextlib + + import zc.lockfile + +@@ -572,7 +572,7 @@ class FileSession(Session): + def release_lock(self, path=None): + """Release the lock on the currently-loaded session data.""" + self.lock.close() +- with contextlib2.suppress(FileNotFoundError): ++ with contextlib.suppress(FileNotFoundError): + os.remove(self.lock._path) + self.locked = False + diff -urN www/py-cherrypy/files/extra-patch-setup.py www/py-cherrypy/files/extra-patch-setup.py --- www/py-cherrypy/files/extra-patch-setup.py 1970-01-01 08:00:00.000000000 +0800 +++ www/py-cherrypy/files/extra-patch-setup.py 2020-10-16 09:33:09.743385000 +0800 @@ -0,0 +1,10 @@ +--- setup.py.orig 2020-10-16 01:28:48 UTC ++++ setup.py +@@ -66,7 +66,6 @@ params = dict( + 'portend>=2.1.1', + 'more_itertools', + 'zc.lockfile', +- 'contextlib2', + ], + extras_require={ + 'docs': [