From 3ef16d1582246d5da74cdae89aa5d46a8b7005c2 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Mon, 7 Sep 2009 22:39:21 +0000 Subject: Reimplement isvalidatom() to use a single regular expression match. Thanks to Marat Radchenko for this patch from bug #276813. svn path=/main/trunk/; revision=14213 --- pym/portage/versions.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'pym/portage/versions.py') diff --git a/pym/portage/versions.py b/pym/portage/versions.py index f434ff768..bbea9b7c9 100644 --- a/pym/portage/versions.py +++ b/pym/portage/versions.py @@ -5,7 +5,9 @@ import re -ver_regexp = re.compile("^(cvs\\.)?(\\d+)((\\.\\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\\d*)*)(-r(\\d+))?$") +_version = r'(cvs\.)?(\d+)((\.\d+)*)([a-z]?)((_(pre|p|beta|alpha|rc)\d*)*)(-r(\d+))?' + +ver_regexp = re.compile("^" + _version + "$") suffix_regexp = re.compile("^(alpha|beta|rc|pre|p)(\\d*)$") suffix_value = {"pre": -2, "p": 0, "alpha": -4, "beta": -3, "rc": -1} endversion_keys = ["pre", "p", "alpha", "beta", "rc"] -- cgit v1.2.3-1-g7c22