From 2be09bbf5a692fcab786f2b06ff07791b2220dbd Mon Sep 17 00:00:00 2001 From: skelly37 Date: Sat, 12 Mar 2022 10:41:35 +0100 Subject: [PATCH] Removed deprecated picard.version_from_string() --- picard/__init__.py | 4 ---- test/test_versions.py | 27 ++++++++++++--------------- 2 files changed, 12 insertions(+), 19 deletions(-) diff --git a/picard/__init__.py b/picard/__init__.py index d688bc6b0..850edab3b 100644 --- a/picard/__init__.py +++ b/picard/__init__.py @@ -50,10 +50,6 @@ PICARD_VERSION = Version(2, 8, 0, 'dev', 2) # ie. win32_20140415091256 PICARD_BUILD_VERSION_STR = "" -def version_from_string(version_str): - """Deprecated: Use picard.version.Version.from_string instead""" - return Version.from_string(version_str) - PICARD_VERSION_STR = PICARD_VERSION.to_string() PICARD_VERSION_STR_SHORT = PICARD_VERSION.to_string(short=True) diff --git a/test/test_versions.py b/test/test_versions.py index 3dfb5020c..f8a3d98eb 100644 --- a/test/test_versions.py +++ b/test/test_versions.py @@ -28,8 +28,7 @@ from test.picardtestcase import PicardTestCase from picard import ( api_versions, - api_versions_tuple, - version_from_string + api_versions_tuple ) from picard.version import ( Version, @@ -54,7 +53,6 @@ class VersionsTest(PicardTestCase): for v, s in versions: self.assertEqual(str(v), s) self.assertEqual(v, Version.from_string(s)) - self.assertEqual(v, version_from_string(s)) def test_version_conversion_short(self): versions = ( @@ -71,41 +69,40 @@ class VersionsTest(PicardTestCase): for v, s in versions: self.assertEqual(v.to_string(short=True), s) self.assertEqual(v, Version.from_string(s)) - self.assertEqual(v, version_from_string(s)) def test_version_from_string_underscores(self): l, s = (1, 1, 0, 'dev', 0), '1_1_0_dev_0' - self.assertEqual(l, version_from_string(s)) + self.assertEqual(l, Version.from_string(s)) def test_version_from_string_prefixed(self): l, s = (1, 1, 0, 'dev', 0), 'anything_28_1_1_0_dev_0' - self.assertEqual(l, version_from_string(s)) + self.assertEqual(l, Version.from_string(s)) def test_version_single_digit(self): l, s = (2, 0, 0, 'final', 0), '2' - self.assertEqual(l, version_from_string(s)) + self.assertEqual(l, Version.from_string(s)) self.assertEqual(l, Version(2)) def test_version_from_string_prefixed_final(self): l, s = (1, 1, 0, 'final', 0), 'anything_28_1_1_0' - self.assertEqual(l, version_from_string(s)) + self.assertEqual(l, Version.from_string(s)) def test_from_string_invalid_identifier(self): - self.assertRaises(VersionError, version_from_string, '1.1.0dev') - self.assertRaises(VersionError, version_from_string, '1.1.0devx') + self.assertRaises(VersionError, Version.from_string, '1.1.0dev') + self.assertRaises(VersionError, Version.from_string, '1.1.0devx') def test_version_from_string_invalid_partial(self): - self.assertRaises(VersionError, version_from_string, '1dev') - self.assertRaises(VersionError, version_from_string, '1.0dev') - self.assertRaises(VersionError, version_from_string, '123.') + self.assertRaises(VersionError, Version.from_string, '1dev') + self.assertRaises(VersionError, Version.from_string, '1.0dev') + self.assertRaises(VersionError, Version.from_string, '123.') @unittest.skipUnless(len(api_versions) > 1, "api_versions do not have enough elements") def test_api_versions_1(self): """Check api versions format and order (from oldest to newest)""" for i in range(len(api_versions) - 1): - a = version_from_string(api_versions[i]) - b = version_from_string(api_versions[i+1]) + a = Version.from_string(api_versions[i]) + b = Version.from_string(api_versions[i+1]) self.assertLess(a, b) @unittest.skipUnless(len(api_versions_tuple) > 1, "api_versions_tuple do not have enough elements")