Re: [gentoo-portage-dev] [PATCH] use_reduce: reserve missing_white_space_check for invalid tokens (bug 611838)

[Brian Dolbec]

On Mon,  6 Mar 2017 12:51:08 -0800
Zac Medico <zmedico@g.o> wrote:

> Since it's possible for a URI to contain parenthesis, only call
> missing_white_space_check for tokens that fail to validate with
> token_class. The missing_white_space_check function only serves
> to clarify exception messages, so it must not be allowed to
> reject valid tokens.
> ---
>  pym/portage/dep/__init__.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/pym/portage/dep/__init__.py b/pym/portage/dep/__init__.py
> index 968ff5b..6ff6adc 100644
> --- a/pym/portage/dep/__init__.py
> +++ b/pym/portage/dep/__init__.py
> @@ -677,8 +677,6 @@ def use_reduce(depstr, uselist=[], masklist=[],
> matchall=False, excludeall=[], i need_simple_token = True
>  			stack[level].append(token)
>  		else:
> -			missing_white_space_check(token, pos)
> -
>  			if need_bracket:
>  				raise InvalidDependString(
>  					_("expected: '(', got: '%s',
> token %s") % (token, pos+1)) @@ -698,12 +696,14 @@ def
> use_reduce(depstr, uselist=[], masklist=[], matchall=False,
> excludeall=[], i token = token_class(token, eapi=eapi,
> is_valid_flag=is_valid_flag) except InvalidAtom as e:
> +
> missing_white_space_check(token, pos) raise InvalidDependString(
>  							_("Invalid
> atom (%s), token %s") \ % (e, pos+1), errors=(e,))
>  					except SystemExit:
>  						raise
>  					except Exception as e:
> +
> missing_white_space_check(token, pos) raise InvalidDependString(
>  							_("Invalid
> token '%s', token %s") % (token, pos+1))

looks good :)

-- 
Brian Dolbec <dolsen>