Skip to content

Commit fa4be14

Browse files
committed
Replace TestCase method aliases removed in Python 3.12
Fixes: PyFilesystem#568
1 parent 8ed9dc4 commit fa4be14

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2121
([#535](https://github.com/PyFilesystem/pyfilesystem2/issues/535)).
2222
- Fixed a bug where files could be truncated or deleted when moved / copied onto itself.
2323
Closes [#546](https://github.com/PyFilesystem/pyfilesystem2/issues/546)
24+
- TestCase method aliases removed in Python 3.12 were replaced and now works with all Python versions.
25+
Closes [#568](https://github.com/PyFilesystem/pyfilesystem2/issues/568)
2426

2527
## [2.4.16] - 2022-05-02
2628

CONTRIBUTORS.md

+1
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ Many thanks to the following developers for contributing to this project:
4141
- [@sqwishy](https://github.com/sqwishy)
4242
- [Sven Schliesing](https://github.com/muffl0n)
4343
- [Thomas Feldmann](https://github.com/tfeldmann)
44+
- [Tomáš Hrnčiar](https://github.com/hrnciar)
4445
- [Tim Gates](https://github.com/timgates42/)
4546
- [@tkossak](https://github.com/tkossak)
4647
- [Todd Levi](https://github.com/televi)

fs/test.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ def test_remove(self):
10821082
self.fs.makedirs("foo/bar/baz/")
10831083

10841084
error_msg = "resource 'foo/bar/egg/test.txt' not found"
1085-
assertRaisesRegex = getattr(self, "assertRaisesRegex", self.assertRaisesRegexp)
1085+
assertRaisesRegex = getattr(self, "assertRaisesRegex", self.assertRaisesRegex)
10861086
with assertRaisesRegex(errors.ResourceNotFound, error_msg):
10871087
self.fs.remove("foo/bar/egg/test.txt")
10881088

tests/test_move.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def test_move_file_overwrite(self, _, fs_url):
167167
self.assertFalse(src.exists("target.txt"))
168168
self.assertFalse(dst.exists("file.txt"))
169169
self.assertTrue(dst.exists("target.txt"))
170-
self.assertEquals(dst.readtext("target.txt"), "source content")
170+
self.assertEqual(dst.readtext("target.txt"), "source content")
171171

172172
@parameterized.expand([("temp", "temp://"), ("mem", "mem://")])
173173
def test_move_file_overwrite_itself(self, _, fs_url):
@@ -177,7 +177,7 @@ def test_move_file_overwrite_itself(self, _, fs_url):
177177
tmp.writetext("file.txt", "content")
178178
fs.move.move_file(tmp, "file.txt", tmp, "file.txt")
179179
self.assertTrue(tmp.exists("file.txt"))
180-
self.assertEquals(tmp.readtext("file.txt"), "content")
180+
self.assertEqual(tmp.readtext("file.txt"), "content")
181181

182182
@parameterized.expand([("temp", "temp://"), ("mem", "mem://")])
183183
def test_move_file_overwrite_itself_relpath(self, _, fs_url):
@@ -188,7 +188,7 @@ def test_move_file_overwrite_itself_relpath(self, _, fs_url):
188188
new_dir.writetext("file.txt", "content")
189189
fs.move.move_file(tmp, "dir/../dir/file.txt", tmp, "dir/file.txt")
190190
self.assertTrue(tmp.exists("dir/file.txt"))
191-
self.assertEquals(tmp.readtext("dir/file.txt"), "content")
191+
self.assertEqual(tmp.readtext("dir/file.txt"), "content")
192192

193193
@parameterized.expand([(True,), (False,)])
194194
def test_move_file_cleanup_on_error(self, cleanup):

0 commit comments

Comments
 (0)