mirror of https://github.com/python/cpython
Cosmetic fixes for whitespace and a regex in packaging.
The goal of the regex is to catch a (alpha), b (beta), c or rc (release candidate), so the existing pattern puzzled me. Tests were OK before and after the change.
This commit is contained in:
parent
763cc6eaee
commit
c4637714b0
|
@ -103,7 +103,7 @@ class VersionTestCase(unittest.TestCase):
|
|||
False
|
||||
>>> V('1.2.0rc1') >= V('1.2.0')
|
||||
False
|
||||
>>> (V('1.0') > V('1.0b2'))
|
||||
>>> V('1.0') > V('1.0b2')
|
||||
True
|
||||
>>> V('1.0') > V('1.0c2')
|
||||
True
|
||||
|
@ -248,9 +248,9 @@ class VersionWhiteBoxTestCase(unittest.TestCase):
|
|||
def test_parse_numdots(self):
|
||||
# For code coverage completeness, as pad_zeros_length can't be set or
|
||||
# influenced from the public interface
|
||||
self.assertEqual(V('1.0')._parse_numdots('1.0', '1.0',
|
||||
pad_zeros_length=3),
|
||||
[1, 0, 0])
|
||||
self.assertEqual(
|
||||
V('1.0')._parse_numdots('1.0', '1.0', pad_zeros_length=3),
|
||||
[1, 0, 0])
|
||||
|
||||
|
||||
def test_suite():
|
||||
|
|
|
@ -253,7 +253,7 @@ def suggest_normalized_version(s):
|
|||
# if we have something like "b-2" or "a.2" at the end of the
|
||||
# version, that is pobably beta, alpha, etc
|
||||
# let's remove the dash or dot
|
||||
rs = re.sub(r"([abc|rc])[\-\.](\d+)$", r"\1\2", rs)
|
||||
rs = re.sub(r"([abc]|rc)[\-\.](\d+)$", r"\1\2", rs)
|
||||
|
||||
# 1.0-dev-r371 -> 1.0.dev371
|
||||
# 0.1-dev-r79 -> 0.1.dev79
|
||||
|
|
Loading…
Reference in New Issue