[gentoo-commits] proj/portage:master commit in: lib/_emerge/, lib/portage/sync/modules/rsync/, lib/portage/util/_async/, ...

[Zac Medico]

commit:     762f5aff42f9240cb732993b5ba4e99fa2b9383b
Author:     Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Thu Aug  6 18:21:42 2020 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Aug  7 02:53:11 2020 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=762f5aff

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 <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>

 lib/_emerge/FakeVartree.py              |  7 ++++---
 lib/_emerge/FifoIpcDaemon.py            |  2 +-
 lib/_emerge/MetadataRegen.py            |  7 ++++---
 lib/portage/dbapi/porttree.py           |  2 +-
 lib/portage/emaint/modules/move/move.py |  5 +++--
 lib/portage/metadata.py                 | 16 +++++++++-------
 lib/portage/sync/modules/rsync/rsync.py | 29 +++++++++++++++--------------
 lib/portage/util/_async/BuildLogger.py  |  4 ++--
 8 files changed, 39 insertions(+), 33 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):

diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index 9ad8addc7..0c2a4e2b3 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -42,9 +42,9 @@ import os as _os
 import traceback
 import warnings
 import errno
-import collections
 import functools
 
+import collections
 from collections import OrderedDict
 from urllib.parse import urlparse
 

diff --git a/lib/portage/emaint/modules/move/move.py b/lib/portage/emaint/modules/move/move.py
index e2df53fd8..8fc3269ca 100644
--- a/lib/portage/emaint/modules/move/move.py
+++ b/lib/portage/emaint/modules/move/move.py
@@ -1,10 +1,11 @@
-# Copyright 2005-2018 Gentoo Foundation
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+from _emerge.Package import Package
+
 import portage
 from portage import os
 from portage.exception import InvalidData
-from _emerge.Package import Package
 from portage.versions import _pkg_str
 
 class MoveHandler:

diff --git a/lib/portage/metadata.py b/lib/portage/metadata.py
index 935bcc307..f932c094a 100644
--- a/lib/portage/metadata.py
+++ b/lib/portage/metadata.py
@@ -1,19 +1,21 @@
+# Copyright 1998-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
 
 from __future__ import print_function
 
-import sys
-import signal
 import logging
 import operator
-
 import portage
-from portage import os
+import sys
+import signal
+
+from _emerge.ProgressHandler import ProgressHandler
+
 from portage import eapi_is_supported
-from portage.util import writemsg_level
+from portage import os
 from portage.cache.cache_errors import CacheError
-from _emerge.ProgressHandler import ProgressHandler
 from portage.eclass_cache import hashed_path
-
+from portage.util import writemsg_level
 
 def action_metadata(settings, portdb, myopts, porttrees=None):
 	if porttrees is None:

diff --git a/lib/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py
index cf574208d..88b36ab79 100644
--- a/lib/portage/sync/modules/rsync/rsync.py
+++ b/lib/portage/sync/modules/rsync/rsync.py
@@ -1,31 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-import sys
-import logging
-import time
-import signal
-import socket
 import datetime
 import io
-import re
+import logging
 import random
+import re
+import signal
+import socket
+import sys
 import tempfile
+import time
+
+from _emerge.UserQuery import UserQuery
 
 import portage
-from portage import os
 from portage import _unicode_decode
-from portage.util import writemsg_level
+from portage import os
+from portage.const import VCS_DIRS, TIMESTAMP_FORMAT, RSYNC_PACKAGE_ATOM
 from portage.output import create_color_func, yellow, blue, bold
+from portage.sync.getaddrinfo_validate import getaddrinfo_validate
+from portage.sync.syncbase import NewBase
+from portage.util import writemsg, writemsg_level, writemsg_stdout
+from portage.util.futures import asyncio
+
 good = create_color_func("GOOD")
 bad = create_color_func("BAD")
 warn = create_color_func("WARN")
-from portage.const import VCS_DIRS, TIMESTAMP_FORMAT, RSYNC_PACKAGE_ATOM
-from portage.util import writemsg, writemsg_stdout
-from portage.util.futures import asyncio
-from portage.sync.getaddrinfo_validate import getaddrinfo_validate
-from _emerge.UserQuery import UserQuery
-from portage.sync.syncbase import NewBase
 
 try:
 	from gemato.exceptions import GematoException

diff --git a/lib/portage/util/_async/BuildLogger.py b/lib/portage/util/_async/BuildLogger.py
index f5fea77ea..20362cf6b 100644
--- a/lib/portage/util/_async/BuildLogger.py
+++ b/lib/portage/util/_async/BuildLogger.py
@@ -3,15 +3,15 @@
 
 import subprocess
 
+from _emerge.AsynchronousTask import AsynchronousTask
+
 from portage import os
 from portage.util import shlex_split
-from _emerge.AsynchronousTask import AsynchronousTask
 from portage.util._async.PipeLogger import PipeLogger
 from portage.util._async.PopenProcess import PopenProcess
 from portage.util.futures import asyncio
 from portage.util.futures.compat_coroutine import coroutine
 
-
 class BuildLogger(AsynchronousTask):
 	"""
 	Write to a log file, with compression support provided by PipeLogger.