1 |
* This fixes ungrouped imports for a portion of the repo. The remaining |
2 |
fixes will come in another batch of atomic commits as the imports are |
3 |
buried behind conditionals, are __futures__ that may be able to go |
4 |
away, etc |
5 |
|
6 |
* Per the above, check will not be enabled yet |
7 |
|
8 |
Signed-off-by: Aaron Bauman <bman@g.o> |
9 |
--- |
10 |
lib/_emerge/FakeVartree.py | 7 +++--- |
11 |
lib/_emerge/FifoIpcDaemon.py | 2 +- |
12 |
lib/_emerge/MetadataRegen.py | 6 +++-- |
13 |
lib/portage/emaint/modules/move/move.py | 6 +++-- |
14 |
lib/portage/metadata.py | 16 +++++++------ |
15 |
lib/portage/sync/modules/rsync/rsync.py | 31 +++++++++++++------------ |
16 |
lib/portage/util/_async/BuildLogger.py | 4 ++-- |
17 |
7 files changed, 40 insertions(+), 32 deletions(-) |
18 |
|
19 |
diff --git a/lib/_emerge/FakeVartree.py b/lib/_emerge/FakeVartree.py |
20 |
index 37349bcdd..fa6c17beb 100644 |
21 |
--- a/lib/_emerge/FakeVartree.py |
22 |
+++ b/lib/_emerge/FakeVartree.py |
23 |
@@ -1,12 +1,14 @@ |
24 |
# Copyright 1999-2020 Gentoo Authors |
25 |
# Distributed under the terms of the GNU General Public License v2 |
26 |
|
27 |
+import portage |
28 |
import warnings |
29 |
|
30 |
-import portage |
31 |
-from portage import os |
32 |
from _emerge.Package import Package |
33 |
from _emerge.PackageVirtualDbapi import PackageVirtualDbapi |
34 |
+from _emerge.resolver.DbapiProvidesIndex import PackageDbapiProvidesIndex |
35 |
+ |
36 |
+from portage import os |
37 |
from portage.const import VDB_PATH |
38 |
from portage.dbapi.vartree import vartree |
39 |
from portage.dep._slot_operator import find_built_slot_operator_atoms |
40 |
@@ -14,7 +16,6 @@ from portage.eapi import _get_eapi_attrs |
41 |
from portage.exception import InvalidData, InvalidDependString |
42 |
from portage.update import grab_updates, parse_updates, update_dbentries |
43 |
from portage.versions import _pkg_str |
44 |
-from _emerge.resolver.DbapiProvidesIndex import PackageDbapiProvidesIndex |
45 |
|
46 |
|
47 |
class FakeVardbGetPath: |
48 |
diff --git a/lib/_emerge/FifoIpcDaemon.py b/lib/_emerge/FifoIpcDaemon.py |
49 |
index a21e94db6..22aa6f9fc 100644 |
50 |
--- a/lib/_emerge/FifoIpcDaemon.py |
51 |
+++ b/lib/_emerge/FifoIpcDaemon.py |
52 |
@@ -1,9 +1,9 @@ |
53 |
# Copyright 2010-2020 Gentoo Authors |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
|
56 |
+from _emerge.AbstractPollTask import AbstractPollTask |
57 |
|
58 |
from portage import os |
59 |
-from _emerge.AbstractPollTask import AbstractPollTask |
60 |
from portage.cache.mappings import slot_dict_class |
61 |
|
62 |
class FifoIpcDaemon(AbstractPollTask): |
63 |
diff --git a/lib/_emerge/MetadataRegen.py b/lib/_emerge/MetadataRegen.py |
64 |
index 8eb110a46..dc3ef7e57 100644 |
65 |
--- a/lib/_emerge/MetadataRegen.py |
66 |
+++ b/lib/_emerge/MetadataRegen.py |
67 |
@@ -2,10 +2,12 @@ |
68 |
# Distributed under the terms of the GNU General Public License v2 |
69 |
|
70 |
import portage |
71 |
-from portage import os |
72 |
-from portage.dep import _repo_separator |
73 |
+ |
74 |
from _emerge.EbuildMetadataPhase import EbuildMetadataPhase |
75 |
+ |
76 |
+from portage import os |
77 |
from portage.cache.cache_errors import CacheError |
78 |
+from portage.dep import _repo_separator |
79 |
from portage.util._async.AsyncScheduler import AsyncScheduler |
80 |
|
81 |
class MetadataRegen(AsyncScheduler): |
82 |
diff --git a/lib/portage/emaint/modules/move/move.py b/lib/portage/emaint/modules/move/move.py |
83 |
index e2df53fd8..4d1bb0df1 100644 |
84 |
--- a/lib/portage/emaint/modules/move/move.py |
85 |
+++ b/lib/portage/emaint/modules/move/move.py |
86 |
@@ -1,10 +1,12 @@ |
87 |
-# Copyright 2005-2018 Gentoo Foundation |
88 |
+# Copyright 2005-2020 Gentoo Authors |
89 |
# Distributed under the terms of the GNU General Public License v2 |
90 |
|
91 |
import portage |
92 |
+ |
93 |
+from _emerge.Package import Package |
94 |
+ |
95 |
from portage import os |
96 |
from portage.exception import InvalidData |
97 |
-from _emerge.Package import Package |
98 |
from portage.versions import _pkg_str |
99 |
|
100 |
class MoveHandler: |
101 |
diff --git a/lib/portage/metadata.py b/lib/portage/metadata.py |
102 |
index 935bcc307..f932c094a 100644 |
103 |
--- a/lib/portage/metadata.py |
104 |
+++ b/lib/portage/metadata.py |
105 |
@@ -1,19 +1,21 @@ |
106 |
+# Copyright 1998-2020 Gentoo Authors |
107 |
+# Distributed under the terms of the GNU General Public License v2 |
108 |
|
109 |
from __future__ import print_function |
110 |
|
111 |
-import sys |
112 |
-import signal |
113 |
import logging |
114 |
import operator |
115 |
- |
116 |
import portage |
117 |
-from portage import os |
118 |
+import sys |
119 |
+import signal |
120 |
+ |
121 |
+from _emerge.ProgressHandler import ProgressHandler |
122 |
+ |
123 |
from portage import eapi_is_supported |
124 |
-from portage.util import writemsg_level |
125 |
+from portage import os |
126 |
from portage.cache.cache_errors import CacheError |
127 |
-from _emerge.ProgressHandler import ProgressHandler |
128 |
from portage.eclass_cache import hashed_path |
129 |
- |
130 |
+from portage.util import writemsg_level |
131 |
|
132 |
def action_metadata(settings, portdb, myopts, porttrees=None): |
133 |
if porttrees is None: |
134 |
diff --git a/lib/portage/sync/modules/rsync/rsync.py b/lib/portage/sync/modules/rsync/rsync.py |
135 |
index cf574208d..50d086a60 100644 |
136 |
--- a/lib/portage/sync/modules/rsync/rsync.py |
137 |
+++ b/lib/portage/sync/modules/rsync/rsync.py |
138 |
@@ -1,31 +1,32 @@ |
139 |
# Copyright 1999-2020 Gentoo Authors |
140 |
# Distributed under the terms of the GNU General Public License v2 |
141 |
|
142 |
-import sys |
143 |
-import logging |
144 |
-import time |
145 |
-import signal |
146 |
-import socket |
147 |
import datetime |
148 |
import io |
149 |
-import re |
150 |
+import logging |
151 |
+import portage |
152 |
import random |
153 |
+import re |
154 |
+import signal |
155 |
+import socket |
156 |
+import sys |
157 |
import tempfile |
158 |
+import time |
159 |
+ |
160 |
+from _emerge.UserQuery import UserQuery |
161 |
|
162 |
-import portage |
163 |
-from portage import os |
164 |
from portage import _unicode_decode |
165 |
-from portage.util import writemsg_level |
166 |
+from portage import os |
167 |
+from portage.const import VCS_DIRS, TIMESTAMP_FORMAT, RSYNC_PACKAGE_ATOM |
168 |
from portage.output import create_color_func, yellow, blue, bold |
169 |
+from portage.sync.getaddrinfo_validate import getaddrinfo_validate |
170 |
+from portage.sync.syncbase import NewBase |
171 |
+from portage.util import writemsg, writemsg_level, writemsg_stdout |
172 |
+from portage.util.futures import asyncio |
173 |
+ |
174 |
good = create_color_func("GOOD") |
175 |
bad = create_color_func("BAD") |
176 |
warn = create_color_func("WARN") |
177 |
-from portage.const import VCS_DIRS, TIMESTAMP_FORMAT, RSYNC_PACKAGE_ATOM |
178 |
-from portage.util import writemsg, writemsg_stdout |
179 |
-from portage.util.futures import asyncio |
180 |
-from portage.sync.getaddrinfo_validate import getaddrinfo_validate |
181 |
-from _emerge.UserQuery import UserQuery |
182 |
-from portage.sync.syncbase import NewBase |
183 |
|
184 |
try: |
185 |
from gemato.exceptions import GematoException |
186 |
diff --git a/lib/portage/util/_async/BuildLogger.py b/lib/portage/util/_async/BuildLogger.py |
187 |
index f5fea77ea..20362cf6b 100644 |
188 |
--- a/lib/portage/util/_async/BuildLogger.py |
189 |
+++ b/lib/portage/util/_async/BuildLogger.py |
190 |
@@ -3,15 +3,15 @@ |
191 |
|
192 |
import subprocess |
193 |
|
194 |
+from _emerge.AsynchronousTask import AsynchronousTask |
195 |
+ |
196 |
from portage import os |
197 |
from portage.util import shlex_split |
198 |
-from _emerge.AsynchronousTask import AsynchronousTask |
199 |
from portage.util._async.PipeLogger import PipeLogger |
200 |
from portage.util._async.PopenProcess import PopenProcess |
201 |
from portage.util.futures import asyncio |
202 |
from portage.util.futures.compat_coroutine import coroutine |
203 |
|
204 |
- |
205 |
class BuildLogger(AsynchronousTask): |
206 |
""" |
207 |
Write to a log file, with compression support provided by PipeLogger. |
208 |
-- |
209 |
2.28.0 |