View | Details | Raw Unified | Return to bug 250379 | Differences between
and this patch

Collapse All | Expand All

(-)www/py-cherrypy/Makefile (+6 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	cherrypy
4
PORTNAME=	cherrypy
5
PORTVERSION=	17.4.2
5
PORTVERSION=	17.4.2
6
PORTREVISION=	1
6
CATEGORIES=	www python
7
CATEGORIES=	www python
7
MASTER_SITES=	CHEESESHOP
8
MASTER_SITES=	CHEESESHOP
8
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
9
PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
Lines 44-49 Link Here
44
.endif
45
.endif
45
46
46
.include <bsd.port.pre.mk>
47
.include <bsd.port.pre.mk>
48
49
.if ${PYTHON_REL} >= 3800
50
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-cherrypy_lib_sessions.py
51
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-setup.py
52
.endif
47
53
48
.if ${PYTHON_REL} < 3800
54
.if ${PYTHON_REL} < 3800
49
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
55
RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}contextlib2>0:devel/py-contextlib2@${PY_FLAVOR}
(-)www/py-cherrypy/files/extra-patch-cherrypy_lib_sessions.py (+20 lines)
Line 0 Link Here
1
--- cherrypy/lib/sessions.py.orig	2020-10-16 01:25:39 UTC
2
+++ cherrypy/lib/sessions.py
3
@@ -109,7 +109,7 @@ import binascii
4
 
5
 import six
6
 from six.moves import cPickle as pickle
7
-import contextlib2
8
+import contextlib
9
 
10
 import zc.lockfile
11
 
12
@@ -572,7 +572,7 @@ class FileSession(Session):
13
     def release_lock(self, path=None):
14
         """Release the lock on the currently-loaded session data."""
15
         self.lock.close()
16
-        with contextlib2.suppress(FileNotFoundError):
17
+        with contextlib.suppress(FileNotFoundError):
18
             os.remove(self.lock._path)
19
         self.locked = False
20
 
(-)www/py-cherrypy/files/extra-patch-setup.py (+10 lines)
Line 0 Link Here
1
--- setup.py.orig	2020-10-16 01:28:48 UTC
2
+++ setup.py
3
@@ -66,7 +66,6 @@ params = dict(
4
         'portend>=2.1.1',
5
         'more_itertools',
6
         'zc.lockfile',
7
-        'contextlib2',
8
     ],
9
     extras_require={
10
         'docs': [

Return to bug 250379