Re: [gentoo-portage-dev] [PATCH] Remove unneeded native_kwargs wrapper

[Michał Górny]

On Tue, 24 May 2016 11:08:44 +0200
Alexander Berntsen  wrote:

> -BEGIN PGP SIGNED MESSAGE-
> Hash: SHA512
> 
> Welp that took forever to read through... I didn't see anything wrong
> with it. So if tests pass and everything looks OK to you, go ahead and
> push it.

Merged now.

-- 
Best regards,
Michał Górny



pgpWLd3EwKFeo.pgp
Description: OpenPGP digital signature

Re: [gentoo-portage-dev] [PATCH] Remove unneeded native_kwargs wrapper

[Alexander Berntsen]

-BEGIN PGP SIGNED MESSAGE-
Hash: SHA512

Welp that took forever to read through... I didn't see anything wrong
with it. So if tests pass and everything looks OK to you, go ahead and
push it.

- -- 
Alexander
berna...@gentoo.org
https://secure.plaimi.net/~alexander
-BEGIN PGP SIGNATURE-
Version: GnuPG v2

iQIcBAEBCgAGBQJXRBobAAoJENQqWdRUGk8BVjcP/R/Z5tdz+bLcfnNS9STwGXai
uoMsdY79dBkdRvdK6nT/IwWKa4474Vuwp/yzTShGTxzj4npDPT+c8POba/Ubeh7y
+zqHmKmw+qZycLncjvr8ycttLEk3nRWOddurHriwQFDpco2xUiMQwXUIE4u+KagV
9uIl1pU94JkyX3gFJFc9blM9Nz+roX5OtmWeMmiZp1zRb6BfOS+bUuL7GpA4wimR
hs5VNUsbMhUkm4sbxQhnWaDHszuS3j/kM9oW053PtFKW6jhrEGSdQDUa1cXaS7Tb
B0hF1UKRLQQz+OVUoySq3qEdjL0JHJNRhEDmm5obafVd2CCRjqr88TA2Tg/EepV8
AAf409mZ4L6ayFXz2KRzT2ahx4CBRCS34T3+LDKrAlZw/u8IfwJ2N0tH19iyZY8a
fAzwBZLyDM8qTmJ5Iwj2N92DmFn5nf8coovUCNcAKTLWdo+WVVF3EILi/CfBUvwd
U/Ac58xg9NCY5rPT820zpxyW6LglZLhgG0V9fcfVGBQ9ktvAkuQatDi0wNRxpuqt
QS7WpNp7TlTmDCGsc1g9R220L4SPYmsObfHpp9oWd6ALpArXXYWlQLBfB0fFqmpJ
qQ00AgOYLXc5Zc3GopQjXl68fjLspHdtS/0u7CbCairZ1n/QG+FrVjRvlr1Whpnc
VHfMMSvbb28THWvSzsFG
=vBmo
-END PGP SIGNATURE-

[gentoo-portage-dev] [PATCH] Remove unneeded native_kwargs wrapper

[Michał Górny]

Remove the native_kwargs wrapper and all uses of it. As pointed out by
Zac Medico, this was only needed for Python < 2.6.5, and we no longer
support those versions for quite some time.
---
 bin/portageq  |  2 +-
 pym/_emerge/MiscFunctionsProcess.py   |  3 +--
 pym/_emerge/actions.py|  2 +-
 pym/_emerge/depgraph.py   | 12 
 pym/_emerge/resolver/output.py|  3 +--
 pym/portage/__init__.py   |  9 -
 pym/portage/dbapi/porttree.py |  4 ++--
 pym/portage/dbapi/vartree.py  |  3 +--
 pym/portage/news.py   |  3 +--
 pym/portage/package/ebuild/doebuild.py|  6 +++---
 pym/portage/repository/config.py  |  2 +-
 pym/portage/sync/modules/cvs/cvs.py   |  4 ++--
 pym/portage/sync/modules/git/git.py   |  4 ++--
 pym/portage/sync/modules/rsync/rsync.py   |  4 ++--
 pym/portage/sync/modules/svn/svn.py   |  6 +++---
 pym/portage/sync/modules/webrsync/webrsync.py |  2 +-
 pym/portage/util/__init__.py  |  2 +-
 pym/portage/util/configparser.py  |  5 ++---
 repoman/pym/repoman/modules/scan/ebuild/checks.py |  2 +-
 19 files changed, 30 insertions(+), 48 deletions(-)

diff --git a/bin/portageq b/bin/portageq
index 832d004..d645635 100755
--- a/bin/portageq
+++ b/bin/portageq
@@ -1281,7 +1281,7 @@ def add_pquery_arguments(parser):
kwargs["help"] = opt_info["help"]
except KeyError:
pass
-   arg_group.add_argument(*pargs, 
**portage._native_kwargs(kwargs))
+   arg_group.add_argument(*pargs, **kwargs)
 
 
 def usage(argv):
diff --git a/pym/_emerge/MiscFunctionsProcess.py 
b/pym/_emerge/MiscFunctionsProcess.py
index b7f5892..99cf598 100644
--- a/pym/_emerge/MiscFunctionsProcess.py
+++ b/pym/_emerge/MiscFunctionsProcess.py
@@ -40,8 +40,7 @@ class MiscFunctionsProcess(AbstractEbuildProcess):
# think this is a real phase.
phase_backup = self.settings.pop("EBUILD_PHASE", None)
try:
-   return spawn(" ".join(args), self.settings,
-   **portage._native_kwargs(kwargs))
+   return spawn(" ".join(args), self.settings, **kwargs)
finally:
if phase_backup is not None:
self.settings["EBUILD_PHASE"] = phase_backup
diff --git a/pym/_emerge/actions.py b/pym/_emerge/actions.py
index 59626ad..2ca7902 100644
--- a/pym/_emerge/actions.py
+++ b/pym/_emerge/actions.py
@@ -2378,7 +2378,7 @@ def load_emerge_config(emerge_config=None, **kargs):
if v and v.strip():
kwargs[k] = v
emerge_config.trees = portage.create_trees(trees=emerge_config.trees,
-   **portage._native_kwargs(kwargs))
+   **kwargs)
 
for root_trees in emerge_config.trees.values():
settings = root_trees["vartree"].settings
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py
index cfaafa3..f78f08d 100644
--- a/pym/_emerge/depgraph.py
+++ b/pym/_emerge/depgraph.py
@@ -4175,8 +4175,7 @@ class depgraph(object):
pargs, kwargs = item
kwargs = kwargs.copy()
kwargs['collect_use_changes'] = True
-   if not self._show_unsatisfied_dep(*pargs,
-   **portage._native_kwargs(kwargs)):
+   if not self._show_unsatisfied_dep(*pargs, 
**kwargs):
remaining_items.append(item)
if len(remaining_items) != 
len(self._dynamic_config._unsatisfied_deps_for_display):

self._dynamic_config._unsatisfied_deps_for_display = remaining_items
@@ -4327,8 +4326,7 @@ class depgraph(object):
not been scheduled for replacement.
"""
kwargs["trees"] = self._dynamic_config._graph_trees
-   return self._select_atoms_highest_available(*pargs,
-   **portage._native_kwargs(kwargs))
+   return self._select_atoms_highest_available(*pargs, **kwargs)
 
def _select_atoms_highest_available(self, root, depstring,
myuse=None, parent=None, strict=True, trees=None, 
priority=None):
@@ -8511,8 +8509,7 @@ class depgraph(object):
writemsg("\n", noiselevel=-1)
 
for pargs, kwargs in 
self._dynamic_config._unsatisfied_deps_for_display:
-   self._show_unsatisfied_dep(*pargs,
-   **portage._native