From b993bd8f8e400a411631e22852fe20445fd9bddb Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Tue, 5 Jun 2018 00:07:16 +0900 Subject: [PATCH] Rename protocol_version_string to version_string --- lib/peer.py | 2 +- lib/util.py | 2 +- tests/lib/test_util.py | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/peer.py b/lib/peer.py index ef54215..2d1e879 100644 --- a/lib/peer.py +++ b/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): diff --git a/lib/util.py b/lib/util.py index 0da31ca..5577da8 100644 --- a/lib/util.py +++ b/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: diff --git a/tests/lib/test_util.py b/tests/lib/test_util.py index d9cb517..7c19360 100644 --- a/tests/lib/test_util.py +++ b/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)