aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Bauman <bman@gentoo.org>2020-08-06 14:21:42 -0400
committerZac Medico <zmedico@gentoo.org>2020-08-06 19:53:11 -0700
commit762f5aff42f9240cb732993b5ba4e99fa2b9383b (patch)
tree1e413b6e05960181c17bd851ecec495c4da914bc /lib/_emerge
parentlib/*: fix superfluous-parens and enable check (diff)
downloadportage-762f5aff42f9240cb732993b5ba4e99fa2b9383b.tar.gz
portage-762f5aff42f9240cb732993b5ba4e99fa2b9383b.tar.bz2
portage-762f5aff42f9240cb732993b5ba4e99fa2b9383b.zip
lib/*: Fix ungrouped-imports
* This fixes ungrouped imports for a portion of the repo. The remaining fixes will come in another batch of atomic commits as the imports are buried behind conditionals, are __futures__ that may be able to go away, etc * Per the above, check will not be enabled yet Signed-off-by: Aaron Bauman <bman@gentoo.org> Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/FakeVartree.py7
-rw-r--r--lib/_emerge/FifoIpcDaemon.py2
-rw-r--r--lib/_emerge/MetadataRegen.py7
3 files changed, 9 insertions, 7 deletions
diff --git a/lib/_emerge/FakeVartree.py b/lib/_emerge/FakeVartree.py
index 37349bcdd..c5c9e27ca 100644
--- a/lib/_emerge/FakeVartree.py
+++ b/lib/_emerge/FakeVartree.py
@@ -3,10 +3,12 @@
import warnings
-import portage
-from portage import os
from _emerge.Package import Package
from _emerge.PackageVirtualDbapi import PackageVirtualDbapi
+from _emerge.resolver.DbapiProvidesIndex import PackageDbapiProvidesIndex
+
+import portage
+from portage import os
from portage.const import VDB_PATH
from portage.dbapi.vartree import vartree
from portage.dep._slot_operator import find_built_slot_operator_atoms
@@ -14,7 +16,6 @@ from portage.eapi import _get_eapi_attrs
from portage.exception import InvalidData, InvalidDependString
from portage.update import grab_updates, parse_updates, update_dbentries
from portage.versions import _pkg_str
-from _emerge.resolver.DbapiProvidesIndex import PackageDbapiProvidesIndex
class FakeVardbGetPath:
diff --git a/lib/_emerge/FifoIpcDaemon.py b/lib/_emerge/FifoIpcDaemon.py
index a21e94db6..22aa6f9fc 100644
--- a/lib/_emerge/FifoIpcDaemon.py
+++ b/lib/_emerge/FifoIpcDaemon.py
@@ -1,9 +1,9 @@
# Copyright 2010-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+from _emerge.AbstractPollTask import AbstractPollTask
from portage import os
-from _emerge.AbstractPollTask import AbstractPollTask
from portage.cache.mappings import slot_dict_class
class FifoIpcDaemon(AbstractPollTask):
diff --git a/lib/_emerge/MetadataRegen.py b/lib/_emerge/MetadataRegen.py
index 8eb110a46..967554503 100644
--- a/lib/_emerge/MetadataRegen.py
+++ b/lib/_emerge/MetadataRegen.py
@@ -1,11 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+from _emerge.EbuildMetadataPhase import EbuildMetadataPhase
+
import portage
from portage import os
-from portage.dep import _repo_separator
-from _emerge.EbuildMetadataPhase import EbuildMetadataPhase
from portage.cache.cache_errors import CacheError
+from portage.dep import _repo_separator
from portage.util._async.AsyncScheduler import AsyncScheduler
class MetadataRegen(AsyncScheduler):