| 1 |
commit: ebb542165883468ebf31341e150cdbebcd7439a4 |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Mar 31 20:27:11 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Mar 31 20:27:11 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=ebb54216 |
| 7 |
|
| 8 |
varexpand: use frozenset for word characters |
| 9 |
|
| 10 |
--- |
| 11 |
pym/portage/util/__init__.py | 5 +++-- |
| 12 |
1 files changed, 3 insertions(+), 2 deletions(-) |
| 13 |
|
| 14 |
diff --git a/pym/portage/util/__init__.py b/pym/portage/util/__init__.py |
| 15 |
index ae560c0..a7bc9bd 100644 |
| 16 |
--- a/pym/portage/util/__init__.py |
| 17 |
+++ b/pym/portage/util/__init__.py |
| 18 |
@@ -646,6 +646,8 @@ def getconfig(mycfg, tolerant=0, allow_sourcing=False, expand=True): |
| 19 |
raise portage.exception.ParseError(str(e)+" in "+mycfg) |
| 20 |
return mykeys |
| 21 |
|
| 22 |
+_varexpand_word_chars = frozenset(string.ascii_letters + string.digits + "_") |
| 23 |
+ |
| 24 |
def varexpand(mystring, mydict=None): |
| 25 |
if mydict is None: |
| 26 |
mydict = {} |
| 27 |
@@ -715,8 +717,7 @@ def varexpand(mystring, mydict=None): |
| 28 |
else: |
| 29 |
braced=False |
| 30 |
myvstart=pos |
| 31 |
- validchars=string.ascii_letters+string.digits+"_" |
| 32 |
- while mystring[pos] in validchars: |
| 33 |
+ while mystring[pos] in _varexpand_word_chars: |
| 34 |
if (pos+1)>=len(mystring): |
| 35 |
if braced: |
| 36 |
return "" |
Archives