Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

bug fix: version comparison is not lexographic.

Browse source 
Use distutils.version to compare version strings.
This commit is contained in:
Job Evers-Meltzer 2016-07-25 12:25:10 -05:00
parent ea5d31b530
commit d0bc383a79
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lbrynet/lbrynet_daemon/LBRYDaemon.py
View file

@ -1,6 +1,7 @@
import binascii import binascii
from datetime import datetime from datetime import datetime
from decimal import Decimal from decimal import Decimal
import distutils.version
import locale import locale
import logging.handlers import logging.handlers
import mimetypes import mimetypes
@ -2314,4 +2315,4 @@ def get_version_from_tag(tag):
def compare_versions(a, b): def compare_versions(a, b):
"""Returns True if version a is more recent than version b""" """Returns True if version a is more recent than version b"""
return a > b return distutils.version.StrictVersion(a) > distutils.version.StrictVersion(b)

3
tests/lbrynet/lbrynet_daemon/test_LBRYDaemon.py
View file

@ -36,3 +36,6 @@ class MiscTests(unittest.TestCase):
def test_error_is_thrown_when_version_cant_be_parsed(self): def test_error_is_thrown_when_version_cant_be_parsed(self):
with self.assertRaises(Exception): with self.assertRaises(Exception):
LBRYDaemon.get_version_from_tag('garbage') LBRYDaemon.get_version_from_tag('garbage')
def test_compare_versions_isnot_lexographic(self):
self.assertTrue(LBRYDaemon.compare_versions('0.3.10', '0.3.6'))