Merge pull request #723 from samj1912/version

Update version_to_string to follow PEP440
metabrainz · May 10, 2017 · 242fd33 · 242fd33
2 parents be13e40 + ab54c17
commit 242fd33
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/picard/__init__.py b/picard/__init__.py
@@ -54,7 +54,7 @@ def version_to_string(version, short=False):
         else:
             version_str = '%d.%d.%d' % version[:3]
     else:
-        version_str = '%d.%d.%d%s%d' % version
+        version_str = '%d.%d.%d.%s%d' % version
     return version_str
 
 

diff --git a/test/test_versions.py b/test/test_versions.py
@@ -19,29 +19,37 @@ def assertLess(self, a, b, msg=None):
 class VersionsTest(unittest.TestCase):
 
     def test_version_conv_1(self):
-        l, s = (0, 0, 1, 'dev', 1), '0.0.1dev1'
+        l, s = (0, 0, 1, 'dev', 1), '0.0.1.dev1'
+        r = '0.0.1.dev1'
         self.assertEqual(version_to_string(l), s)
         self.assertEqual(l, version_from_string(s))
+        self.assertEqual(l, version_from_string(r))
 
     def test_version_conv_2(self):
-        l, s = (1, 1, 0, 'final', 0), '1.1.0final0'
+        l, s = (1, 1, 0, 'final', 0), '1.1.0.final0'
+        r = '1.1.0.final0'
         self.assertEqual(version_to_string(l), s)
         self.assertEqual(l, version_from_string(s))
+        self.assertEqual(l, version_from_string(r))
 
     def test_version_conv_3(self):
-        l, s = (1, 1, 0, 'dev', 0), '1.1.0dev0'
+        l, s = (1, 1, 0, 'dev', 0), '1.1.0.dev0'
+        r = '1.1.0.dev0'
         self.assertEqual(version_to_string(l), s)
         self.assertEqual(l, version_from_string(s))
+        self.assertEqual(l, version_from_string(r))
 
     def test_version_conv_4(self):
         l, s = (1, 0, 2, 'final', 0), '1.0.2'
         self.assertEqual(version_to_string(l, short=True), s)
         self.assertEqual(l, version_from_string(s))
 
     def test_version_conv_5(self):
-        l, s = (999, 999, 999, 'dev', 999), '999.999.999dev999'
+        l, s = (999, 999, 999, 'dev', 999), '999.999.999.dev999'
+        r = '999.999.999dev999'
         self.assertEqual(version_to_string(l), s)
         self.assertEqual(l, version_from_string(s))
+        self.assertEqual(l, version_from_string(r))
 
     def test_version_conv_6(self):
         l = (1, 0, 2, 'xx', 0)
@@ -60,11 +68,11 @@ def test_version_conv_9(self):
         self.assertEqual(version_to_string(l, short=True), s)
 
     def test_version_conv_10(self):
-        l, s = (1, 1, 0, 'dev', 0), '1.1.0dev0'
+        l, s = (1, 1, 0, 'dev', 0), '1.1.0.dev0'
         self.assertEqual(version_to_string(l, short=True), s)
 
     def test_version_conv_11(self):
-        l, s = ('1', '1', '0', 'dev', '0'), '1.1.0dev0'
+        l, s = ('1', '1', '0', 'dev', '0'), '1.1.0.dev0'
         self.assertEqual(version_to_string(l), s)
 
     def test_version_conv_12(self):