sysfce2
diff --git a/‎CHANGES.rst‎
Lines changed: 6 additions & 2 deletions b/‎CHANGES.rst‎
Lines changed: 6 additions & 2 deletions
diff --git a/‎cherrypy/lib/sessions.py‎
Lines changed: 0 additions & 3 deletions b/‎cherrypy/lib/sessions.py‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎cherrypy/test/test_session.py‎
Lines changed: 1 addition & 2 deletions b/‎cherrypy/test/test_session.py‎
Lines changed: 1 addition & 2 deletions
@@ -1,5 +1,9 @@
-v18.2.0dev
-----------
+v18.2.0
+-------
+
+* File-based sessions no longer attempt to remove the lock files
+  when releasing locks, instead deferring to the default behavior
+  of zc.lockfile. Fixes :issue:`1391` and :issue:`1779`.
 
 * :pr:`1794`: Add native support for ``308 Permanent Redirect``
   usable via ``raise cherrypy.HTTPRedirect('/new_uri', 308)``.
 
@@ -107,7 +107,6 @@
 import threading
 import binascii
 import pickle
-import contextlib
 
 import zc.lockfile
 
@@ -566,8 +565,6 @@ 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 contextlib.suppress(FileNotFoundError):
-            os.remove(self.lock._path)
         self.locked = False
 
     def clean_up(self):
 
@@ -222,7 +222,7 @@ def f():
             return [
                 x
                 for x in os.listdir(localDir)
-                if x.startswith('session-')
+                if x.startswith('session-') and not x.endswith('.lock')
             ]
         assert f() == []
 
@@ -236,7 +236,6 @@ def test_1_Ram_Concurrency(self):
         self.getPage('/set_session_cls/cherrypy.lib.sessions.RamSession')
         self._test_Concurrency()
 
-    @pytest.mark.xfail(reason='#1306')
     def test_2_File_Concurrency(self):
         self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession')
         self._test_Concurrency()
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ def f():`
`222`	`222`	`return [`
`223`	`223`	`x`
`224`	`224`	`for x in os.listdir(localDir)`
`225`		`- if x.startswith('session-')`
	`225`	`+ if x.startswith('session-') and not x.endswith('.lock')`
`226`	`226`	`]`
`227`	`227`	`assert f() == []`
`228`	`228`
`@@ -236,7 +236,6 @@ def test_1_Ram_Concurrency(self):`
`236`	`236`	`self.getPage('/set_session_cls/cherrypy.lib.sessions.RamSession')`
`237`	`237`	`self._test_Concurrency()`
`238`	`238`
`239`		`- @pytest.mark.xfail(reason='#1306')`
`240`	`239`	`def test_2_File_Concurrency(self):`
`241`	`240`	`self.getPage('/set_session_cls/cherrypy.lib.sessions.FileSession')`
`242`	`241`	`self._test_Concurrency()`