Remove reliance on contextlib2

cherrypy · Sep 2, 2018 · 2fc78dc · 2fc78dc
1 parent d8213f2
commit 2fc78dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/cherrypy/lib/sessions.py b/cherrypy/lib/sessions.py
@@ -107,8 +107,7 @@
 import threading
 import binascii
 import pickle
-
-import contextlib2
+import contextlib
 
 import zc.lockfile
 
@@ -567,7 +566,7 @@ def acquire_lock(self, path=None):
     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 --git a/setup.py b/setup.py
@@ -62,7 +62,6 @@
         'portend>=2.1.1',
         'more_itertools',
         'zc.lockfile',
-        'contextlib2',
     ],
     extras_require={
         'docs': [