From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 11 Jan 2007 22:21:07 +0000 (-0000)
Subject: Use a global to ensure that the valid_category regex is cached.
X-Git-Tag: v2.1.2~57
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4c93236b70445b62f9f1286ed2a7414a7b46e679;p=portage.git

Use a global to ensure that the valid_category regex is cached.

svn path=/main/trunk/; revision=5574
---

diff --git a/pym/portage_versions.py b/pym/portage_versions.py
index 715319167..dffcdd3b1 100644
--- a/pym/portage_versions.py
+++ b/pym/portage_versions.py
@@ -248,6 +248,8 @@ def pkgsplit(mypkg,silent=1):
 		pkgcache[mypkg]=None
 		return None
 
+_valid_category = re.compile("^\w[\w-]*")
+
 catcache={}
 def catpkgsplit(mydata,silent=1):
 	"""
@@ -267,7 +269,7 @@ def catpkgsplit(mydata,silent=1):
 	"""
 	
 	# Categories may contain a-zA-z0-9+_- but cannot start with -
-	valid_category = re.compile("^\w[\w-]*")
+	global _valid_category
 	try:
 		if not catcache[mydata]:
 			return None
@@ -280,7 +282,7 @@ def catpkgsplit(mydata,silent=1):
 		retval=["null"]
 		p_split=pkgsplit(mydata,silent=silent)
 	elif len(mysplit)==2:
-		if not valid_category.match(mysplit[0]):
+		if not _valid_category.match(mysplit[0]):
 			raise InvalidData("Invalid category in %s" %mydata )
 		retval=[mysplit[0]]
 		p_split=pkgsplit(mysplit[1],silent=silent)