diff options
author | Zac Medico <zmedico@gentoo.org> | 2012-03-31 13:27:11 -0700 |
---|---|---|
committer | Zac Medico <zmedico@gentoo.org> | 2012-03-31 13:27:11 -0700 |
commit | ebb542165883468ebf31341e150cdbebcd7439a4 (patch) | |
tree | 5aff19e0d4e792340e6acf7464f27014f2701a37 | |
parent | 7490a70d40ed47e064a08f10b2319a4b8c9180d9 (diff) | |
download | portage-ebb542165883468ebf31341e150cdbebcd7439a4.tar.gz portage-ebb542165883468ebf31341e150cdbebcd7439a4.tar.bz2 portage-ebb542165883468ebf31341e150cdbebcd7439a4.zip |
varexpand: use frozenset for word characters
-rw-r--r-- | pym/portage/util/__init__.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py index ae560c0d5..a7bc9bd0f 100644 --- a/pym/portage/util/__init__.py +++ b/pym/portage/util/__init__.py @@ -646,6 +646,8 @@ def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True): raise portage.exception.ParseError(str(e)+" in "+mycfg) return mykeys +_varexpand_word_chars = frozenset(string.ascii_letters + string.digits + "_") + def varexpand(mystring, mydict=None): if mydict is None: mydict = {} @@ -715,8 +717,7 @@ def varexpand(mystring, mydict=None): else: braced=False myvstart=pos - validchars=string.ascii_letters+string.digits+"_" - while mystring[pos] in validchars: + while mystring[pos] in _varexpand_word_chars: if (pos+1)>=len(mystring): if braced: return "" |