diff options
| author | Zac Medico <zmedico@gentoo.org> | 2013-01-18 15:05:42 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2013-01-18 15:05:42 -0800 |
| commit | e9a04922c144b267534e3335d2ff3d7bb8994b80 (patch) | |
| tree | 0c43dc33336066103b605bc7441ac94bc85575b9 /pym/_emerge | |
| parent | 71235479ab208318dff391420f9695f5cfaa9594 (diff) | |
| download | portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.tar.gz portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.tar.bz2 portage-e9a04922c144b267534e3335d2ff3d7bb8994b80.zip | |
Add workaround for Python 2.6.4 issue 4978
Avoid "TypeError: keywords must be strings" issue triggered
by unicode_literals: http://bugs.python.org/issue4978
Diffstat (limited to 'pym/_emerge')
| -rw-r--r-- | pym/_emerge/depgraph.py | 9 | ||||
| -rw-r--r-- | pym/_emerge/resolver/output.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pym/_emerge/depgraph.py b/pym/_emerge/depgraph.py index b5dba31dc..7a967957c 100644 --- a/pym/_emerge/depgraph.py +++ b/pym/_emerge/depgraph.py @@ -2971,7 +2971,8 @@ class depgraph(object): not been scheduled for replacement. """ kwargs["trees"] = self._dynamic_config._graph_trees - return self._select_atoms_highest_available(*pargs, **kwargs) + return self._select_atoms_highest_available(*pargs, + **portage._native_kwargs(kwargs)) def _select_atoms_highest_available(self, root, depstring, myuse=None, parent=None, strict=True, trees=None, priority=None): @@ -6813,7 +6814,8 @@ class depgraph(object): writemsg("\n", noiselevel=-1) for pargs, kwargs in self._dynamic_config._unsatisfied_deps_for_display: - self._show_unsatisfied_dep(*pargs, **kwargs) + self._show_unsatisfied_dep(*pargs, + **portage._native_kwargs(kwargs)) def saveNomergeFavorites(self): """Find atoms in favorites that are not in the mergelist and add them @@ -7158,7 +7160,8 @@ class depgraph(object): try: for pargs, kwargs in self._dynamic_config._unsatisfied_deps_for_display: self._show_unsatisfied_dep( - *pargs, check_autounmask_breakage=True, **kwargs) + *pargs, check_autounmask_breakage=True, + **portage._native_kwargs(kwargs)) except self._autounmask_breakage: return True return False diff --git a/pym/_emerge/resolver/output.py b/pym/_emerge/resolver/output.py index 651a4f73c..6aeadee94 100644 --- a/pym/_emerge/resolver/output.py +++ b/pym/_emerge/resolver/output.py @@ -12,6 +12,7 @@ __all__ = ( import sys +import portage from portage import os from portage.dbapi.dep_expand import dep_expand from portage.dep import cpvequal, _repo_separator, _slot_separator @@ -316,7 +317,8 @@ class Display(object): kwargs["myrepo"] = pkg.repo myfilesdict = None try: - myfilesdict = db.getfetchsizes(pkg.cpv, **kwargs) + myfilesdict = db.getfetchsizes(pkg.cpv, + **portage._native_kwargs(kwargs)) except InvalidDependString as e: # FIXME: validate SRC_URI earlier depstr, = db.aux_get(pkg.cpv, |