Browse Source

Rename protocol_version_string to version_string

patch-2
Neil Booth 7 years ago
parent
commit
b993bd8f8e
  1. 2
      lib/peer.py
  2. 2
      lib/util.py
  3. 10
      tests/lib/test_util.py

2
lib/peer.py

@ -230,7 +230,7 @@ class Peer(object):
def _protocol_version_string(self, key):
version_str = self.features.get(key)
ptuple = util.protocol_tuple(version_str)
return util.protocol_version_string(ptuple)
return util.version_string(ptuple)
@cachedproperty
def protocol_min(self):

2
lib/util.py

@ -267,7 +267,7 @@ def protocol_tuple(s):
except Exception:
return (0, )
def protocol_version_string(ptuple):
def version_string(ptuple):
'''Convert a version tuple such as (1, 2) to "1.2".
There is always at least one dot, so (1, ) becomes "1.0".'''
while len(ptuple) < 2:

10
tests/lib/test_util.py

@ -176,11 +176,11 @@ def test_protocol_tuple():
assert util.protocol_tuple("0.10") == (0, 10)
assert util.protocol_tuple("2.5.3") == (2, 5, 3)
def test_protocol_version_string():
assert util.protocol_version_string(()) == "0.0"
assert util.protocol_version_string((1, )) == "1.0"
assert util.protocol_version_string((1, 2)) == "1.2"
assert util.protocol_version_string((1, 3, 2)) == "1.3.2"
def test_version_string():
assert util.version_string(()) == "0.0"
assert util.version_string((1, )) == "1.0"
assert util.version_string((1, 2)) == "1.2"
assert util.version_string((1, 3, 2)) == "1.3.2"
def test_protocol_version():
assert util.protocol_version(None, "1.0", "1.0") == (1, 0)

Loading…
Cancel
Save