Re: [gentoo-portage-dev] [PATCH 2/4] portage.eapi: use tuple instead of str for namedtuple definition

2022-03-08 Thread Alec Warner
Looks merge-able.

On Wed, Feb 23, 2022 at 8:15 PM Matt Turner  wrote:
>
> From: "Wolfgang E. Sanyer" 
>
> Reviewed-by: Matt Turner 
> Signed-off-by: Wolfgang E. Sanyer 
> ---
>  lib/portage/eapi.py | 52 -
>  1 file changed, 33 insertions(+), 19 deletions(-)
>
> diff --git a/lib/portage/eapi.py b/lib/portage/eapi.py
> index adee87d00..18069b04b 100644
> --- a/lib/portage/eapi.py
> +++ b/lib/portage/eapi.py
> @@ -288,25 +288,39 @@ def eapi_has_sysroot(eapi):
>
>  _eapi_attrs = collections.namedtuple(
>  "_eapi_attrs",
> -"allows_package_provided "
> -"bdepend "
> -"broot "
> -"dots_in_PN dots_in_use_flags "
> -"exports_AA "
> -"exports_EBUILD_PHASE_FUNC "
> -"exports_ECLASSDIR "
> -"exports_KV "
> -"exports_merge_type "
> -"exports_PORTDIR "
> -"exports_replace_vars "
> -"feature_flag_test "
> -"idepend iuse_defaults iuse_effective posixish_locale "
> -"path_variables_end_with_trailing_slash "
> -"prefix "
> -"repo_deps required_use required_use_at_most_one_of "
> -"selective_src_uri_restriction slot_operator slot_deps "
> -"src_uri_arrows strong_blocks use_deps use_dep_defaults "
> -"empty_groups_always_true sysroot",
> +(
> +"allows_package_provided",
> +"bdepend",
> +"broot",
> +"dots_in_PN",
> +"dots_in_use_flags",
> +"exports_AA",
> +"exports_EBUILD_PHASE_FUNC",
> +"exports_ECLASSDIR",
> +"exports_KV",
> +"exports_merge_type",
> +"exports_PORTDIR",
> +"exports_replace_vars",
> +"feature_flag_test",
> +"idepend",
> +"iuse_defaults",
> +"iuse_effective",
> +"posixish_locale",
> +"path_variables_end_with_trailing_slash",
> +"prefix",
> +"repo_deps",
> +"required_use",
> +"required_use_at_most_one_of",
> +"selective_src_uri_restriction",
> +"slot_operator",
> +"slot_deps",
> +"src_uri_arrows",
> +"strong_blocks",
> +"use_deps",
> +"use_dep_defaults",
> +"empty_groups_always_true",
> +"sysroot",
> +),
>  )
>
>
> --
> 2.34.1
>
>



[gentoo-portage-dev] [PATCH 2/4] portage.eapi: use tuple instead of str for namedtuple definition

2022-02-23 Thread Matt Turner
From: "Wolfgang E. Sanyer" 

Reviewed-by: Matt Turner 
Signed-off-by: Wolfgang E. Sanyer 
---
 lib/portage/eapi.py | 52 -
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/lib/portage/eapi.py b/lib/portage/eapi.py
index adee87d00..18069b04b 100644
--- a/lib/portage/eapi.py
+++ b/lib/portage/eapi.py
@@ -288,25 +288,39 @@ def eapi_has_sysroot(eapi):
 
 _eapi_attrs = collections.namedtuple(
 "_eapi_attrs",
-"allows_package_provided "
-"bdepend "
-"broot "
-"dots_in_PN dots_in_use_flags "
-"exports_AA "
-"exports_EBUILD_PHASE_FUNC "
-"exports_ECLASSDIR "
-"exports_KV "
-"exports_merge_type "
-"exports_PORTDIR "
-"exports_replace_vars "
-"feature_flag_test "
-"idepend iuse_defaults iuse_effective posixish_locale "
-"path_variables_end_with_trailing_slash "
-"prefix "
-"repo_deps required_use required_use_at_most_one_of "
-"selective_src_uri_restriction slot_operator slot_deps "
-"src_uri_arrows strong_blocks use_deps use_dep_defaults "
-"empty_groups_always_true sysroot",
+(
+"allows_package_provided",
+"bdepend",
+"broot",
+"dots_in_PN",
+"dots_in_use_flags",
+"exports_AA",
+"exports_EBUILD_PHASE_FUNC",
+"exports_ECLASSDIR",
+"exports_KV",
+"exports_merge_type",
+"exports_PORTDIR",
+"exports_replace_vars",
+"feature_flag_test",
+"idepend",
+"iuse_defaults",
+"iuse_effective",
+"posixish_locale",
+"path_variables_end_with_trailing_slash",
+"prefix",
+"repo_deps",
+"required_use",
+"required_use_at_most_one_of",
+"selective_src_uri_restriction",
+"slot_operator",
+"slot_deps",
+"src_uri_arrows",
+"strong_blocks",
+"use_deps",
+"use_dep_defaults",
+"empty_groups_always_true",
+"sysroot",
+),
 )
 
 
-- 
2.34.1