1 |
* We only support Py3 now. |
2 |
|
3 |
Signed-off-by: Aaron Bauman <bman@g.o> |
4 |
--- |
5 |
bin/archive-conf | 4 +-- |
6 |
bin/check-implicit-pointer-usage.py | 2 -- |
7 |
bin/clean_locks | 4 +-- |
8 |
bin/dispatch-conf | 4 +-- |
9 |
bin/dohtml.py | 4 +-- |
10 |
bin/doins.py | 2 -- |
11 |
bin/ebuild | 4 +-- |
12 |
bin/egencache | 4 +-- |
13 |
bin/emaint | 4 +-- |
14 |
bin/emerge | 4 +-- |
15 |
bin/env-update | 4 +-- |
16 |
bin/fixpackages | 4 +-- |
17 |
bin/glsa-check | 4 +-- |
18 |
bin/portageq | 4 +-- |
19 |
bin/quickpkg | 4 +-- |
20 |
bin/regenworld | 4 +-- |
21 |
lib/_emerge/Scheduler.py | 2 -- |
22 |
lib/_emerge/UserQuery.py | 2 -- |
23 |
lib/_emerge/actions.py | 2 -- |
24 |
lib/_emerge/chk_updated_cfg_files.py | 2 -- |
25 |
lib/_emerge/countdown.py | 4 +-- |
26 |
lib/_emerge/depgraph.py | 2 -- |
27 |
lib/_emerge/help.py | 4 +-- |
28 |
lib/_emerge/main.py | 2 -- |
29 |
lib/_emerge/post_emerge.py | 4 +-- |
30 |
lib/_emerge/resolver/circular_dependency.py | 8 +++--- |
31 |
lib/_emerge/resolver/package_tracker.py | 4 +-- |
32 |
lib/_emerge/resolver/slot_collision.py | 3 +-- |
33 |
lib/_emerge/unmerge.py | 2 -- |
34 |
lib/portage/_emirrordist/FetchTask.py | 2 -- |
35 |
lib/portage/_global_updates.py | 4 +-- |
36 |
lib/portage/_sets/__init__.py | 2 -- |
37 |
lib/portage/_sets/dbapi.py | 2 -- |
38 |
lib/portage/_sets/libs.py | 4 +-- |
39 |
lib/portage/cache/anydbm.py | 5 ++-- |
40 |
lib/portage/cache/sqlite.py | 3 +-- |
41 |
lib/portage/cvstree.py | 2 -- |
42 |
lib/portage/dbapi/vartree.py | 2 -- |
43 |
lib/portage/dispatch_conf.py | 5 +--- |
44 |
lib/portage/elog/mod_echo.py | 4 +-- |
45 |
lib/portage/emaint/main.py | 4 +-- |
46 |
lib/portage/glsa.py | 27 +++++++++---------- |
47 |
lib/portage/localization.py | 4 +-- |
48 |
lib/portage/metadata.py | 2 -- |
49 |
lib/portage/module.py | 5 +--- |
50 |
lib/portage/news.py | 2 -- |
51 |
lib/portage/output.py | 2 -- |
52 |
lib/portage/package/ebuild/fetch.py | 2 -- |
53 |
lib/portage/sync/controller.py | 3 --- |
54 |
lib/portage/sync/old_tree_timestamp.py | 4 +-- |
55 |
lib/portage/tests/__init__.py | 4 +-- |
56 |
lib/portage/tests/util/test_xattr.py | 4 +-- |
57 |
.../util/_dyn_libs/display_preserved_libs.py | 6 ++--- |
58 |
lib/portage/util/_eventloop/EventLoop.py | 5 +--- |
59 |
.../util/_eventloop/PollSelectAdapter.py | 5 ++-- |
60 |
lib/portage/util/_xattr.py | 4 +-- |
61 |
lib/portage/util/locale.py | 4 +-- |
62 |
lib/portage/util/movefile.py | 2 -- |
63 |
repoman/bin/repoman | 5 ++-- |
64 |
repoman/lib/repoman/actions.py | 4 +-- |
65 |
repoman/lib/repoman/errors.py | 2 -- |
66 |
repoman/lib/repoman/gpg.py | 2 -- |
67 |
repoman/lib/repoman/main.py | 5 ++-- |
68 |
repoman/lib/repoman/metadata.py | 2 -- |
69 |
.../lib/repoman/modules/commit/repochecks.py | 2 -- |
70 |
.../lib/repoman/modules/scan/ebuild/ebuild.py | 3 +-- |
71 |
repoman/lib/repoman/modules/vcs/settings.py | 3 +-- |
72 |
repoman/lib/repoman/modules/vcs/vcs.py | 3 +-- |
73 |
repoman/lib/repoman/profile.py | 2 -- |
74 |
repoman/lib/repoman/scanner.py | 6 ++--- |
75 |
repoman/lib/repoman/tests/__init__.py | 4 +-- |
76 |
repoman/lib/repoman/utilities.py | 4 +-- |
77 |
repoman/runtests | 4 +-- |
78 |
repoman/setup.py | 4 +-- |
79 |
runtests | 4 +-- |
80 |
setup.py | 2 -- |
81 |
76 files changed, 74 insertions(+), 212 deletions(-) |
82 |
|
83 |
diff --git a/bin/archive-conf b/bin/archive-conf |
84 |
index 8341ffe73..bfc54a629 100755 |
85 |
--- a/bin/archive-conf |
86 |
+++ b/bin/archive-conf |
87 |
@@ -1,5 +1,5 @@ |
88 |
#!/usr/bin/python -b |
89 |
-# Copyright 1999-2014 Gentoo Foundation |
90 |
+# Copyright 1999-2020 Gentoo Authors |
91 |
# Distributed under the terms of the GNU General Public License v2 |
92 |
|
93 |
# |
94 |
@@ -9,8 +9,6 @@ |
95 |
# Jeremy Wohl's dispatch-conf script and the portage chkcontents script. |
96 |
# |
97 |
|
98 |
-from __future__ import print_function |
99 |
- |
100 |
import sys |
101 |
|
102 |
from os import path as osp |
103 |
diff --git a/bin/check-implicit-pointer-usage.py b/bin/check-implicit-pointer-usage.py |
104 |
index 868e4b3c8..3914e038d 100755 |
105 |
--- a/bin/check-implicit-pointer-usage.py |
106 |
+++ b/bin/check-implicit-pointer-usage.py |
107 |
@@ -14,8 +14,6 @@ |
108 |
# crashes. |
109 |
# |
110 |
|
111 |
-from __future__ import print_function |
112 |
- |
113 |
import re |
114 |
import sys |
115 |
|
116 |
diff --git a/bin/clean_locks b/bin/clean_locks |
117 |
index 94ba4c606..d1f296065 100755 |
118 |
--- a/bin/clean_locks |
119 |
+++ b/bin/clean_locks |
120 |
@@ -1,9 +1,7 @@ |
121 |
#!/usr/bin/python -b |
122 |
-# Copyright 1999-2014 Gentoo Foundation |
123 |
+# Copyright 1999-2020 Gentoo Authors |
124 |
# Distributed under the terms of the GNU General Public License v2 |
125 |
|
126 |
-from __future__ import print_function |
127 |
- |
128 |
import sys, errno |
129 |
from os import path as osp |
130 |
if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): |
131 |
diff --git a/bin/dispatch-conf b/bin/dispatch-conf |
132 |
index 1759b89b8..fa047244a 100755 |
133 |
--- a/bin/dispatch-conf |
134 |
+++ b/bin/dispatch-conf |
135 |
@@ -1,5 +1,5 @@ |
136 |
#!/usr/bin/python -b |
137 |
-# Copyright 1999-2019 Gentoo Authors |
138 |
+# Copyright 1999-2020 Gentoo Authors |
139 |
# Distributed under the terms of the GNU General Public License v2 |
140 |
|
141 |
# |
142 |
@@ -11,8 +11,6 @@ |
143 |
# dialog menus |
144 |
# |
145 |
|
146 |
-from __future__ import print_function |
147 |
- |
148 |
import atexit |
149 |
import io |
150 |
import re |
151 |
diff --git a/bin/dohtml.py b/bin/dohtml.py |
152 |
index 67c5eb9d1..6a1ed10fe 100755 |
153 |
--- a/bin/dohtml.py |
154 |
+++ b/bin/dohtml.py |
155 |
@@ -1,5 +1,5 @@ |
156 |
#!/usr/bin/python -b |
157 |
-# Copyright 1999-2014 Gentoo Foundation |
158 |
+# Copyright 1999-2020 Gentoo Authors |
159 |
# Distributed under the terms of the GNU General Public License v2 |
160 |
|
161 |
# |
162 |
@@ -28,8 +28,6 @@ |
163 |
# - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS |
164 |
# |
165 |
|
166 |
-from __future__ import print_function |
167 |
- |
168 |
import os as _os |
169 |
import sys |
170 |
|
171 |
diff --git a/bin/doins.py b/bin/doins.py |
172 |
index 5bbf92635..574340132 100644 |
173 |
--- a/bin/doins.py |
174 |
+++ b/bin/doins.py |
175 |
@@ -11,8 +11,6 @@ |
176 |
This script is designed to be executed by ebuild-helpers/doins. |
177 |
""" |
178 |
|
179 |
-from __future__ import print_function |
180 |
- |
181 |
import argparse |
182 |
import errno |
183 |
import grp |
184 |
diff --git a/bin/ebuild b/bin/ebuild |
185 |
index ea02fa95a..09f7f839b 100755 |
186 |
--- a/bin/ebuild |
187 |
+++ b/bin/ebuild |
188 |
@@ -1,9 +1,7 @@ |
189 |
#!/usr/bin/python -b |
190 |
-# Copyright 1999-2019 Gentoo Authors |
191 |
+# Copyright 1999-2020 Gentoo Authors |
192 |
# Distributed under the terms of the GNU General Public License v2 |
193 |
|
194 |
-from __future__ import print_function |
195 |
- |
196 |
import argparse |
197 |
import platform |
198 |
import signal |
199 |
diff --git a/bin/egencache b/bin/egencache |
200 |
index e3d7cbfc3..264c600fe 100755 |
201 |
--- a/bin/egencache |
202 |
+++ b/bin/egencache |
203 |
@@ -1,15 +1,15 @@ |
204 |
#!/usr/bin/python -b |
205 |
-# Copyright 2009-2015 Gentoo Foundation |
206 |
+# Copyright 2009-2020 Gentoo Authors |
207 |
# Distributed under the terms of the GNU General Public License v2 |
208 |
|
209 |
# unicode_literals for compat with TextIOWrapper in Python 2 |
210 |
-from __future__ import print_function |
211 |
|
212 |
import argparse |
213 |
import platform |
214 |
import signal |
215 |
import stat |
216 |
import sys |
217 |
+ |
218 |
# This block ensures that ^C interrupts are handled quietly. |
219 |
try: |
220 |
|
221 |
diff --git a/bin/emaint b/bin/emaint |
222 |
index df904f7c0..5cb667f28 100755 |
223 |
--- a/bin/emaint |
224 |
+++ b/bin/emaint |
225 |
@@ -1,12 +1,10 @@ |
226 |
#!/usr/bin/python -b |
227 |
-# Copyright 2005-2014 Gentoo Foundation |
228 |
+# Copyright 2005-2020 Gentoo Authors |
229 |
# Distributed under the terms of the GNU General Public License v2 |
230 |
|
231 |
"""System health checks and maintenance utilities. |
232 |
""" |
233 |
|
234 |
-from __future__ import print_function |
235 |
- |
236 |
import sys |
237 |
import errno |
238 |
# This block ensures that ^C interrupts are handled quietly. |
239 |
diff --git a/bin/emerge b/bin/emerge |
240 |
index e372f5e9e..f0a2b8429 100755 |
241 |
--- a/bin/emerge |
242 |
+++ b/bin/emerge |
243 |
@@ -1,9 +1,7 @@ |
244 |
#!/usr/bin/python -b |
245 |
-# Copyright 2006-2014 Gentoo Foundation |
246 |
+# Copyright 2006-2020 Gentoo Authors |
247 |
# Distributed under the terms of the GNU General Public License v2 |
248 |
|
249 |
-from __future__ import print_function |
250 |
- |
251 |
import platform |
252 |
import signal |
253 |
import sys |
254 |
diff --git a/bin/env-update b/bin/env-update |
255 |
index 2256b37f5..6571b0011 100755 |
256 |
--- a/bin/env-update |
257 |
+++ b/bin/env-update |
258 |
@@ -1,9 +1,7 @@ |
259 |
#!/usr/bin/python -b |
260 |
-# Copyright 1999-2014 Gentoo Foundation |
261 |
+# Copyright 1999-2020 Gentoo Authors |
262 |
# Distributed under the terms of the GNU General Public License v2 |
263 |
|
264 |
-from __future__ import print_function |
265 |
- |
266 |
import errno |
267 |
import sys |
268 |
|
269 |
diff --git a/bin/fixpackages b/bin/fixpackages |
270 |
index a291e013d..e56d26ec1 100755 |
271 |
--- a/bin/fixpackages |
272 |
+++ b/bin/fixpackages |
273 |
@@ -1,9 +1,7 @@ |
274 |
#!/usr/bin/python -b |
275 |
-# Copyright 1999-2014 Gentoo Foundation |
276 |
+# Copyright 1999-2020 Gentoo Authors |
277 |
# Distributed under the terms of the GNU General Public License v2 |
278 |
|
279 |
-from __future__ import print_function |
280 |
- |
281 |
import argparse |
282 |
import os |
283 |
import sys |
284 |
diff --git a/bin/glsa-check b/bin/glsa-check |
285 |
index 468436353..8200f75b6 100755 |
286 |
--- a/bin/glsa-check |
287 |
+++ b/bin/glsa-check |
288 |
@@ -1,9 +1,7 @@ |
289 |
#!/usr/bin/python -b |
290 |
-# Copyright 1999-2019 Gentoo Authors |
291 |
+# Copyright 1999-2020 Gentoo Authors |
292 |
# Distributed under the terms of the GNU General Public License v2 |
293 |
|
294 |
-from __future__ import print_function |
295 |
- |
296 |
import argparse |
297 |
import re |
298 |
import sys |
299 |
diff --git a/bin/portageq b/bin/portageq |
300 |
index 9fe5d68c1..dbcd9f62d 100755 |
301 |
--- a/bin/portageq |
302 |
+++ b/bin/portageq |
303 |
@@ -1,9 +1,7 @@ |
304 |
#!/usr/bin/python -b |
305 |
-# Copyright 1999-2018 Gentoo Foundation |
306 |
+# Copyright 1999-2020 Gentoo Authors |
307 |
# Distributed under the terms of the GNU General Public License v2 |
308 |
|
309 |
-from __future__ import print_function |
310 |
- |
311 |
import argparse |
312 |
import signal |
313 |
import sys |
314 |
diff --git a/bin/quickpkg b/bin/quickpkg |
315 |
index c4ff198b8..be7d1d7af 100755 |
316 |
--- a/bin/quickpkg |
317 |
+++ b/bin/quickpkg |
318 |
@@ -1,9 +1,7 @@ |
319 |
#!/usr/bin/python -b |
320 |
-# Copyright 1999-2014 Gentoo Foundation |
321 |
+# Copyright 1999-2020 Gentoo Authors |
322 |
# Distributed under the terms of the GNU General Public License v2 |
323 |
|
324 |
-from __future__ import division, print_function |
325 |
- |
326 |
import argparse |
327 |
import errno |
328 |
import math |
329 |
diff --git a/bin/regenworld b/bin/regenworld |
330 |
index bedc58bda..9f33502c6 100755 |
331 |
--- a/bin/regenworld |
332 |
+++ b/bin/regenworld |
333 |
@@ -1,9 +1,7 @@ |
334 |
#!/usr/bin/python -b |
335 |
-# Copyright 1999-2014 Gentoo Foundation |
336 |
+# Copyright 1999-2020 Gentoo Authors |
337 |
# Distributed under the terms of the GNU General Public License v2 |
338 |
|
339 |
-from __future__ import print_function |
340 |
- |
341 |
import sys |
342 |
from os import path as osp |
343 |
if osp.isfile(osp.join(osp.dirname(osp.dirname(osp.realpath(__file__))), ".portage_not_installed")): |
344 |
diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py |
345 |
index 761ba31e0..2427d953c 100644 |
346 |
--- a/lib/_emerge/Scheduler.py |
347 |
+++ b/lib/_emerge/Scheduler.py |
348 |
@@ -1,8 +1,6 @@ |
349 |
# Copyright 1999-2020 Gentoo Authors |
350 |
# Distributed under the terms of the GNU General Public License v2 |
351 |
|
352 |
-from __future__ import division, print_function |
353 |
- |
354 |
from collections import deque |
355 |
import gc |
356 |
import gzip |
357 |
diff --git a/lib/_emerge/UserQuery.py b/lib/_emerge/UserQuery.py |
358 |
index d5273e4ee..0469432fc 100644 |
359 |
--- a/lib/_emerge/UserQuery.py |
360 |
+++ b/lib/_emerge/UserQuery.py |
361 |
@@ -1,8 +1,6 @@ |
362 |
# Copyright 1999-2020 Gentoo Authors |
363 |
# Distributed under the terms of the GNU General Public License v2 |
364 |
|
365 |
-from __future__ import print_function |
366 |
- |
367 |
import signal |
368 |
import sys |
369 |
|
370 |
diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py |
371 |
index 7d2d9b315..d259206ad 100644 |
372 |
--- a/lib/_emerge/actions.py |
373 |
+++ b/lib/_emerge/actions.py |
374 |
@@ -1,8 +1,6 @@ |
375 |
# Copyright 1999-2020 Gentoo Authors |
376 |
# Distributed under the terms of the GNU General Public License v2 |
377 |
|
378 |
-from __future__ import division, print_function |
379 |
- |
380 |
import collections |
381 |
import logging |
382 |
import operator |
383 |
diff --git a/lib/_emerge/chk_updated_cfg_files.py b/lib/_emerge/chk_updated_cfg_files.py |
384 |
index e5e090767..f7f7ab868 100644 |
385 |
--- a/lib/_emerge/chk_updated_cfg_files.py |
386 |
+++ b/lib/_emerge/chk_updated_cfg_files.py |
387 |
@@ -1,8 +1,6 @@ |
388 |
# Copyright 1999-2012, 2016 Gentoo Foundation |
389 |
# Distributed under the terms of the GNU General Public License v2 |
390 |
|
391 |
-from __future__ import print_function |
392 |
- |
393 |
import logging |
394 |
|
395 |
import portage |
396 |
diff --git a/lib/_emerge/countdown.py b/lib/_emerge/countdown.py |
397 |
index 62e3c8dea..e9e774f9a 100644 |
398 |
--- a/lib/_emerge/countdown.py |
399 |
+++ b/lib/_emerge/countdown.py |
400 |
@@ -1,8 +1,6 @@ |
401 |
-# Copyright 1999-2013 Gentoo Foundation |
402 |
+# Copyright 1999-2020 Gentoo Authors |
403 |
# Distributed under the terms of the GNU General Public License v2 |
404 |
|
405 |
-from __future__ import print_function |
406 |
- |
407 |
import sys |
408 |
import time |
409 |
|
410 |
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py |
411 |
index 0810cdaf1..8dc0cd22d 100644 |
412 |
--- a/lib/_emerge/depgraph.py |
413 |
+++ b/lib/_emerge/depgraph.py |
414 |
@@ -1,8 +1,6 @@ |
415 |
# Copyright 1999-2020 Gentoo Authors |
416 |
# Distributed under the terms of the GNU General Public License v2 |
417 |
|
418 |
-from __future__ import division, print_function |
419 |
- |
420 |
import collections |
421 |
import errno |
422 |
import functools |
423 |
diff --git a/lib/_emerge/help.py b/lib/_emerge/help.py |
424 |
index de3d7b593..15e1941ca 100644 |
425 |
--- a/lib/_emerge/help.py |
426 |
+++ b/lib/_emerge/help.py |
427 |
@@ -1,8 +1,6 @@ |
428 |
-# Copyright 1999-2014 Gentoo Foundation |
429 |
+# Copyright 1999-2020 Gentoo Authors |
430 |
# Distributed under the terms of the GNU General Public License v2 |
431 |
|
432 |
-from __future__ import print_function |
433 |
- |
434 |
from portage.output import bold, turquoise, green |
435 |
|
436 |
def emerge_help(): |
437 |
diff --git a/lib/_emerge/main.py b/lib/_emerge/main.py |
438 |
index 12323b17e..f4c7e2715 100644 |
439 |
--- a/lib/_emerge/main.py |
440 |
+++ b/lib/_emerge/main.py |
441 |
@@ -1,8 +1,6 @@ |
442 |
# Copyright 1999-2020 Gentoo Authors |
443 |
# Distributed under the terms of the GNU General Public License v2 |
444 |
|
445 |
-from __future__ import print_function |
446 |
- |
447 |
import argparse |
448 |
import locale |
449 |
import platform |
450 |
diff --git a/lib/_emerge/post_emerge.py b/lib/_emerge/post_emerge.py |
451 |
index e971cf40d..0c4df0d32 100644 |
452 |
--- a/lib/_emerge/post_emerge.py |
453 |
+++ b/lib/_emerge/post_emerge.py |
454 |
@@ -1,8 +1,6 @@ |
455 |
-# Copyright 1999-2012 Gentoo Foundation |
456 |
+# Copyright 1999-2020 Gentoo Authors |
457 |
# Distributed under the terms of the GNU General Public License v2 |
458 |
|
459 |
-from __future__ import print_function |
460 |
- |
461 |
import logging |
462 |
import textwrap |
463 |
|
464 |
diff --git a/lib/_emerge/resolver/circular_dependency.py b/lib/_emerge/resolver/circular_dependency.py |
465 |
index 109f22b9c..7d71e6c88 100644 |
466 |
--- a/lib/_emerge/resolver/circular_dependency.py |
467 |
+++ b/lib/_emerge/resolver/circular_dependency.py |
468 |
@@ -1,17 +1,17 @@ |
469 |
# Copyright 2010-2020 Gentoo Authors |
470 |
# Distributed under the terms of the GNU General Public License v2 |
471 |
|
472 |
-from __future__ import print_function |
473 |
+import logging |
474 |
+ |
475 |
+from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange |
476 |
+from _emerge.Package import Package |
477 |
|
478 |
from itertools import chain, product |
479 |
-import logging |
480 |
|
481 |
from portage.dep import use_reduce, extract_affecting_use, check_required_use, get_required_use_flags |
482 |
from portage.exception import InvalidDependString |
483 |
from portage.output import colorize |
484 |
from portage.util import writemsg_level |
485 |
-from _emerge.DepPrioritySatisfiedRange import DepPrioritySatisfiedRange |
486 |
-from _emerge.Package import Package |
487 |
|
488 |
class circular_dependency_handler: |
489 |
|
490 |
diff --git a/lib/_emerge/resolver/package_tracker.py b/lib/_emerge/resolver/package_tracker.py |
491 |
index 2afa7923b..2cb648538 100644 |
492 |
--- a/lib/_emerge/resolver/package_tracker.py |
493 |
+++ b/lib/_emerge/resolver/package_tracker.py |
494 |
@@ -1,8 +1,6 @@ |
495 |
-# Copyright 2014 Gentoo Foundation |
496 |
+# Copyright 2014-2020 Gentoo Authors |
497 |
# Distributed under the terms of the GNU General Public License v2 |
498 |
|
499 |
-from __future__ import print_function |
500 |
- |
501 |
import bisect |
502 |
import collections |
503 |
|
504 |
diff --git a/lib/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py |
505 |
index df3816717..4fa07ff59 100644 |
506 |
--- a/lib/_emerge/resolver/slot_collision.py |
507 |
+++ b/lib/_emerge/resolver/slot_collision.py |
508 |
@@ -1,12 +1,11 @@ |
509 |
# Copyright 2010-2020 Gentoo Authors |
510 |
# Distributed under the terms of the GNU General Public License v2 |
511 |
|
512 |
-from __future__ import print_function |
513 |
- |
514 |
from _emerge.AtomArg import AtomArg |
515 |
from _emerge.Package import Package |
516 |
from _emerge.PackageArg import PackageArg |
517 |
from _emerge.UseFlagDisplay import pkg_use_display |
518 |
+ |
519 |
from portage.dep import check_required_use |
520 |
from portage.output import colorize |
521 |
from portage._sets.base import InternalPackageSet |
522 |
diff --git a/lib/_emerge/unmerge.py b/lib/_emerge/unmerge.py |
523 |
index 548edaf0c..e8b7c9aaa 100644 |
524 |
--- a/lib/_emerge/unmerge.py |
525 |
+++ b/lib/_emerge/unmerge.py |
526 |
@@ -1,8 +1,6 @@ |
527 |
# Copyright 1999-2020 Gentoo Authors |
528 |
# Distributed under the terms of the GNU General Public License v2 |
529 |
|
530 |
-from __future__ import print_function |
531 |
- |
532 |
import logging |
533 |
import signal |
534 |
import sys |
535 |
diff --git a/lib/portage/_emirrordist/FetchTask.py b/lib/portage/_emirrordist/FetchTask.py |
536 |
index 334da7420..457ca2ac6 100644 |
537 |
--- a/lib/portage/_emirrordist/FetchTask.py |
538 |
+++ b/lib/portage/_emirrordist/FetchTask.py |
539 |
@@ -1,8 +1,6 @@ |
540 |
# Copyright 2013-2020 Gentoo Authors |
541 |
# Distributed under the terms of the GNU General Public License v2 |
542 |
|
543 |
-from __future__ import division |
544 |
- |
545 |
import collections |
546 |
import errno |
547 |
import logging |
548 |
diff --git a/lib/portage/_global_updates.py b/lib/portage/_global_updates.py |
549 |
index 730ade592..855551304 100644 |
550 |
--- a/lib/portage/_global_updates.py |
551 |
+++ b/lib/portage/_global_updates.py |
552 |
@@ -1,8 +1,6 @@ |
553 |
-# Copyright 2010-2014 Gentoo Foundation |
554 |
+# Copyright 2010-2020 Gentoo Authors |
555 |
# Distributed under the terms of the GNU General Public License v2 |
556 |
|
557 |
-from __future__ import print_function |
558 |
- |
559 |
import stat |
560 |
|
561 |
from portage import best, os |
562 |
diff --git a/lib/portage/_sets/__init__.py b/lib/portage/_sets/__init__.py |
563 |
index ea0a8b9b4..efa6314ba 100644 |
564 |
--- a/lib/portage/_sets/__init__.py |
565 |
+++ b/lib/portage/_sets/__init__.py |
566 |
@@ -1,8 +1,6 @@ |
567 |
# Copyright 2007-2020 Gentoo Authors |
568 |
# Distributed under the terms of the GNU General Public License v2 |
569 |
|
570 |
-from __future__ import print_function |
571 |
- |
572 |
__all__ = ["SETPREFIX", "get_boolean", "SetConfigError", |
573 |
"SetConfig", "load_default_config"] |
574 |
|
575 |
diff --git a/lib/portage/_sets/dbapi.py b/lib/portage/_sets/dbapi.py |
576 |
index 288e4e75b..d73aedb8f 100644 |
577 |
--- a/lib/portage/_sets/dbapi.py |
578 |
+++ b/lib/portage/_sets/dbapi.py |
579 |
@@ -1,8 +1,6 @@ |
580 |
# Copyright 2007-2020 Gentoo Authors |
581 |
# Distributed under the terms of the GNU General Public License v2 |
582 |
|
583 |
-from __future__ import division |
584 |
- |
585 |
import glob |
586 |
import re |
587 |
import time |
588 |
diff --git a/lib/portage/_sets/libs.py b/lib/portage/_sets/libs.py |
589 |
index 022e076f5..90efafe79 100644 |
590 |
--- a/lib/portage/_sets/libs.py |
591 |
+++ b/lib/portage/_sets/libs.py |
592 |
@@ -1,8 +1,6 @@ |
593 |
-# Copyright 2007-2013 Gentoo Foundation |
594 |
+# Copyright 2007-2020 Gentoo Authors |
595 |
# Distributed under the terms of the GNU General Public License v2 |
596 |
|
597 |
-from __future__ import print_function |
598 |
- |
599 |
from portage.exception import InvalidData |
600 |
from portage.localization import _ |
601 |
from portage._sets.base import PackageSet |
602 |
diff --git a/lib/portage/cache/anydbm.py b/lib/portage/cache/anydbm.py |
603 |
index 4cdf264e2..70951f824 100644 |
604 |
--- a/lib/portage/cache/anydbm.py |
605 |
+++ b/lib/portage/cache/anydbm.py |
606 |
@@ -1,9 +1,7 @@ |
607 |
-# Copyright 2005-2010 Gentoo Foundation |
608 |
+# Copyright 2005-2020 Gentoo Authors |
609 |
# Distributed under the terms of the GNU General Public License v2 |
610 |
# Author(s): Brian Harring (ferringb@g.o) |
611 |
|
612 |
-from __future__ import absolute_import |
613 |
- |
614 |
import dbm |
615 |
|
616 |
try: |
617 |
@@ -12,6 +10,7 @@ except ImportError: |
618 |
gdbm = None |
619 |
|
620 |
import pickle |
621 |
+ |
622 |
from portage import _unicode_encode |
623 |
from portage import os |
624 |
from portage.cache import fs_template |
625 |
diff --git a/lib/portage/cache/sqlite.py b/lib/portage/cache/sqlite.py |
626 |
index 3a372bcfc..55ae8f0e5 100644 |
627 |
--- a/lib/portage/cache/sqlite.py |
628 |
+++ b/lib/portage/cache/sqlite.py |
629 |
@@ -1,9 +1,8 @@ |
630 |
# Copyright 1999-2020 Gentoo Authors |
631 |
# Distributed under the terms of the GNU General Public License v2 |
632 |
|
633 |
-from __future__ import division |
634 |
- |
635 |
import re |
636 |
+ |
637 |
from portage.cache import fs_template |
638 |
from portage.cache import cache_errors |
639 |
from portage import os |
640 |
diff --git a/lib/portage/cvstree.py b/lib/portage/cvstree.py |
641 |
index cfcb9f48c..72e2baf84 100644 |
642 |
--- a/lib/portage/cvstree.py |
643 |
+++ b/lib/portage/cvstree.py |
644 |
@@ -2,8 +2,6 @@ |
645 |
# Copyright 1998-2020 Gentoo Authors |
646 |
# Distributed under the terms of the GNU General Public License v2 |
647 |
|
648 |
-from __future__ import print_function |
649 |
- |
650 |
import io |
651 |
import re |
652 |
import stat |
653 |
diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py |
654 |
index fbf455363..5799d94f2 100644 |
655 |
--- a/lib/portage/dbapi/vartree.py |
656 |
+++ b/lib/portage/dbapi/vartree.py |
657 |
@@ -1,8 +1,6 @@ |
658 |
# Copyright 1998-2020 Gentoo Authors |
659 |
# Distributed under the terms of the GNU General Public License v2 |
660 |
|
661 |
-from __future__ import division |
662 |
- |
663 |
__all__ = [ |
664 |
"vardbapi", "vartree", "dblink"] + \ |
665 |
["write_contents", "tar_contents"] |
666 |
diff --git a/lib/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py |
667 |
index 71693bb36..148c9dd92 100644 |
668 |
--- a/lib/portage/dispatch_conf.py |
669 |
+++ b/lib/portage/dispatch_conf.py |
670 |
@@ -1,13 +1,10 @@ |
671 |
# archive_conf.py -- functionality common to archive-conf and dispatch-conf |
672 |
-# Copyright 2003-2014 Gentoo Foundation |
673 |
+# Copyright 2003-2020 Gentoo Authors |
674 |
# Distributed under the terms of the GNU General Public License v2 |
675 |
|
676 |
- |
677 |
# Library by Wayne Davison <gentoo@×××××.net>, derived from code |
678 |
# written by Jeremy Wohl (http://igmus.org) |
679 |
|
680 |
-from __future__ import print_function |
681 |
- |
682 |
import errno |
683 |
import io |
684 |
import functools |
685 |
diff --git a/lib/portage/elog/mod_echo.py b/lib/portage/elog/mod_echo.py |
686 |
index 52e8fad8d..80f2b11ac 100644 |
687 |
--- a/lib/portage/elog/mod_echo.py |
688 |
+++ b/lib/portage/elog/mod_echo.py |
689 |
@@ -1,9 +1,7 @@ |
690 |
# elog/mod_echo.py - elog dispatch module |
691 |
-# Copyright 2007-2017 Gentoo Foundation |
692 |
+# Copyright 2007-2020 Gentoo Authors |
693 |
# Distributed under the terms of the GNU General Public License v2 |
694 |
|
695 |
-from __future__ import print_function |
696 |
- |
697 |
import sys |
698 |
from portage.output import EOutput, colorize |
699 |
from portage.const import EBUILD_PHASES |
700 |
diff --git a/lib/portage/emaint/main.py b/lib/portage/emaint/main.py |
701 |
index c743f9bc7..a3f7a1031 100644 |
702 |
--- a/lib/portage/emaint/main.py |
703 |
+++ b/lib/portage/emaint/main.py |
704 |
@@ -1,8 +1,6 @@ |
705 |
-# Copyright 2005-2015 Gentoo Foundation |
706 |
+# Copyright 2005-2020 Gentoo Authors |
707 |
# Distributed under the terms of the GNU General Public License v2 |
708 |
|
709 |
-from __future__ import print_function |
710 |
- |
711 |
import argparse |
712 |
import sys |
713 |
import textwrap |
714 |
diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py |
715 |
index 27957180b..b3f94b5a6 100644 |
716 |
--- a/lib/portage/glsa.py |
717 |
+++ b/lib/portage/glsa.py |
718 |
@@ -1,28 +1,27 @@ |
719 |
# Copyright 2003-2020 Gentoo Authors |
720 |
# Distributed under the terms of the GNU General Public License v2 |
721 |
|
722 |
-from __future__ import absolute_import |
723 |
- |
724 |
-import io |
725 |
-import sys |
726 |
-from urllib.request import urlopen as urllib_request_urlopen |
727 |
import codecs |
728 |
-import re |
729 |
+import io |
730 |
import operator |
731 |
+import portage |
732 |
+import re |
733 |
+import sys |
734 |
import xml.dom.minidom |
735 |
-from io import StringIO |
736 |
+ |
737 |
from functools import reduce |
738 |
|
739 |
-import portage |
740 |
+from io import StringIO |
741 |
+ |
742 |
+from portage import _encodings, _unicode_decode, _unicode_encode |
743 |
from portage import os |
744 |
-from portage import _encodings |
745 |
-from portage import _unicode_decode |
746 |
-from portage import _unicode_encode |
747 |
-from portage.versions import pkgsplit, vercmp |
748 |
-from portage.util import grabfile |
749 |
from portage.const import PRIVATE_PATH |
750 |
-from portage.localization import _ |
751 |
from portage.dep import _slot_separator |
752 |
+from portage.localization import _ |
753 |
+from portage.util import grabfile |
754 |
+from portage.versions import pkgsplit, vercmp |
755 |
+ |
756 |
+from urllib.request import urlopen as urllib_request_urlopen |
757 |
|
758 |
# Note: the space for rgt and rlt is important !! |
759 |
# FIXME: use slot deps instead, requires GLSA format versioning |
760 |
diff --git a/lib/portage/localization.py b/lib/portage/localization.py |
761 |
index de54295a2..ec41caf7b 100644 |
762 |
--- a/lib/portage/localization.py |
763 |
+++ b/lib/portage/localization.py |
764 |
@@ -1,9 +1,7 @@ |
765 |
# localization.py -- Code to manage/help portage localization. |
766 |
-# Copyright 2004-2014 Gentoo Foundation |
767 |
+# Copyright 2004-2020 Gentoo Authors |
768 |
# Distributed under the terms of the GNU General Public License v2 |
769 |
|
770 |
-from __future__ import division |
771 |
- |
772 |
import locale |
773 |
import math |
774 |
|
775 |
diff --git a/lib/portage/metadata.py b/lib/portage/metadata.py |
776 |
index f932c094a..301ad41e2 100644 |
777 |
--- a/lib/portage/metadata.py |
778 |
+++ b/lib/portage/metadata.py |
779 |
@@ -1,8 +1,6 @@ |
780 |
# Copyright 1998-2020 Gentoo Authors |
781 |
# Distributed under the terms of the GNU General Public License v2 |
782 |
|
783 |
-from __future__ import print_function |
784 |
- |
785 |
import logging |
786 |
import operator |
787 |
import portage |
788 |
diff --git a/lib/portage/module.py b/lib/portage/module.py |
789 |
index 301bfbdba..c838edb50 100644 |
790 |
--- a/lib/portage/module.py |
791 |
+++ b/lib/portage/module.py |
792 |
@@ -1,9 +1,6 @@ |
793 |
-# Copyright 2005-2015 Gentoo Foundation |
794 |
+# Copyright 2005-2020 Gentoo Authors |
795 |
# Distributed under the terms of the GNU General Public License v2 |
796 |
|
797 |
- |
798 |
-from __future__ import print_function |
799 |
- |
800 |
from portage import os |
801 |
from portage.exception import PortageException |
802 |
from portage.cache.mappings import ProtectedDict |
803 |
diff --git a/lib/portage/news.py b/lib/portage/news.py |
804 |
index 3d6b04e1e..28fcbba3a 100644 |
805 |
--- a/lib/portage/news.py |
806 |
+++ b/lib/portage/news.py |
807 |
@@ -2,8 +2,6 @@ |
808 |
# Copyright 2006-2020 Gentoo Authors |
809 |
# Distributed under the terms of the GNU General Public License v2 |
810 |
|
811 |
-from __future__ import print_function |
812 |
- |
813 |
__all__ = ["NewsManager", "NewsItem", "DisplayRestriction", |
814 |
"DisplayProfileRestriction", "DisplayKeywordRestriction", |
815 |
"DisplayInstalledRestriction", |
816 |
diff --git a/lib/portage/output.py b/lib/portage/output.py |
817 |
index 098285a52..fb621b28c 100644 |
818 |
--- a/lib/portage/output.py |
819 |
+++ b/lib/portage/output.py |
820 |
@@ -1,8 +1,6 @@ |
821 |
# Copyright 1998-2020 Gentoo Authors |
822 |
# Distributed under the terms of the GNU General Public License v2 |
823 |
|
824 |
-from __future__ import division |
825 |
- |
826 |
__docformat__ = "epytext" |
827 |
|
828 |
import errno |
829 |
diff --git a/lib/portage/package/ebuild/fetch.py b/lib/portage/package/ebuild/fetch.py |
830 |
index 65cf6e123..7c61fe463 100644 |
831 |
--- a/lib/portage/package/ebuild/fetch.py |
832 |
+++ b/lib/portage/package/ebuild/fetch.py |
833 |
@@ -1,8 +1,6 @@ |
834 |
# Copyright 2010-2020 Gentoo Authors |
835 |
# Distributed under the terms of the GNU General Public License v2 |
836 |
|
837 |
-from __future__ import print_function |
838 |
- |
839 |
__all__ = ['fetch'] |
840 |
|
841 |
import errno |
842 |
diff --git a/lib/portage/sync/controller.py b/lib/portage/sync/controller.py |
843 |
index 93cf7bfb4..cb68e2c37 100644 |
844 |
--- a/lib/portage/sync/controller.py |
845 |
+++ b/lib/portage/sync/controller.py |
846 |
@@ -1,9 +1,6 @@ |
847 |
# Copyright 2014-2020 Gentoo Authors |
848 |
# Distributed under the terms of the GNU General Public License v2 |
849 |
|
850 |
-from __future__ import print_function |
851 |
- |
852 |
- |
853 |
import sys |
854 |
import logging |
855 |
import grp |
856 |
diff --git a/lib/portage/sync/old_tree_timestamp.py b/lib/portage/sync/old_tree_timestamp.py |
857 |
index aaed18b56..258ff38a6 100644 |
858 |
--- a/lib/portage/sync/old_tree_timestamp.py |
859 |
+++ b/lib/portage/sync/old_tree_timestamp.py |
860 |
@@ -1,8 +1,6 @@ |
861 |
-# Copyright 2010-2014 Gentoo Foundation |
862 |
+# Copyright 2010-2020 Gentoo Authors |
863 |
# Distributed under the terms of the GNU General Public License v2 |
864 |
|
865 |
-from __future__ import division |
866 |
- |
867 |
import locale |
868 |
import logging |
869 |
import time |
870 |
diff --git a/lib/portage/tests/__init__.py b/lib/portage/tests/__init__.py |
871 |
index 84341ddae..972c974f2 100644 |
872 |
--- a/lib/portage/tests/__init__.py |
873 |
+++ b/lib/portage/tests/__init__.py |
874 |
@@ -1,9 +1,7 @@ |
875 |
# tests/__init__.py -- Portage Unit Test functionality |
876 |
-# Copyright 2006-2013 Gentoo Foundation |
877 |
+# Copyright 2006-2020 Gentoo Authors |
878 |
# Distributed under the terms of the GNU General Public License v2 |
879 |
|
880 |
-from __future__ import print_function |
881 |
- |
882 |
import argparse |
883 |
import sys |
884 |
import time |
885 |
diff --git a/lib/portage/tests/util/test_xattr.py b/lib/portage/tests/util/test_xattr.py |
886 |
index 8e8c2a3d6..55b89abd5 100644 |
887 |
--- a/lib/portage/tests/util/test_xattr.py |
888 |
+++ b/lib/portage/tests/util/test_xattr.py |
889 |
@@ -1,10 +1,8 @@ |
890 |
-# Copyright 2010-2015 Gentoo Foundation |
891 |
+# Copyright 2010-2020 Gentoo Authors |
892 |
# Distributed under the terms of the GNU General Public License v2 |
893 |
|
894 |
"""Tests for the portage.util._xattr module""" |
895 |
|
896 |
-from __future__ import print_function |
897 |
- |
898 |
from unittest import mock |
899 |
|
900 |
import subprocess |
901 |
diff --git a/lib/portage/util/_dyn_libs/display_preserved_libs.py b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
902 |
index b16478d2b..8deafc25e 100644 |
903 |
--- a/lib/portage/util/_dyn_libs/display_preserved_libs.py |
904 |
+++ b/lib/portage/util/_dyn_libs/display_preserved_libs.py |
905 |
@@ -1,11 +1,9 @@ |
906 |
-# Copyright 2007-2013 Gentoo Foundation |
907 |
+# Copyright 2007-2020 Gentoo Authors |
908 |
# Distributed under the terms of the GNU General Public License v2 |
909 |
|
910 |
-from __future__ import print_function |
911 |
- |
912 |
import logging |
913 |
- |
914 |
import portage |
915 |
+ |
916 |
from portage.output import colorize |
917 |
|
918 |
def display_preserved_libs(vardb): |
919 |
diff --git a/lib/portage/util/_eventloop/EventLoop.py b/lib/portage/util/_eventloop/EventLoop.py |
920 |
index b111238a6..94e637853 100644 |
921 |
--- a/lib/portage/util/_eventloop/EventLoop.py |
922 |
+++ b/lib/portage/util/_eventloop/EventLoop.py |
923 |
@@ -1,8 +1,7 @@ |
924 |
# Copyright 1999-2020 Gentoo Authors |
925 |
# Distributed under the terms of the GNU General Public License v2 |
926 |
|
927 |
-from __future__ import division |
928 |
- |
929 |
+import asyncio as _real_asyncio |
930 |
import collections |
931 |
import errno |
932 |
import functools |
933 |
@@ -13,8 +12,6 @@ import signal |
934 |
import time |
935 |
import traceback |
936 |
|
937 |
-import asyncio as _real_asyncio |
938 |
- |
939 |
try: |
940 |
import fcntl |
941 |
except ImportError: |
942 |
diff --git a/lib/portage/util/_eventloop/PollSelectAdapter.py b/lib/portage/util/_eventloop/PollSelectAdapter.py |
943 |
index 08dc664a4..c4637a352 100644 |
944 |
--- a/lib/portage/util/_eventloop/PollSelectAdapter.py |
945 |
+++ b/lib/portage/util/_eventloop/PollSelectAdapter.py |
946 |
@@ -1,10 +1,9 @@ |
947 |
-# Copyright 1999-2014 Gentoo Foundation |
948 |
+# Copyright 1999-2020 Gentoo Authors |
949 |
# Distributed under the terms of the GNU General Public License v2 |
950 |
|
951 |
-from __future__ import division |
952 |
+import select |
953 |
|
954 |
from .PollConstants import PollConstants |
955 |
-import select |
956 |
|
957 |
class PollSelectAdapter: |
958 |
|
959 |
diff --git a/lib/portage/util/_xattr.py b/lib/portage/util/_xattr.py |
960 |
index 531c61efb..8225cfa30 100644 |
961 |
--- a/lib/portage/util/_xattr.py |
962 |
+++ b/lib/portage/util/_xattr.py |
963 |
@@ -1,4 +1,4 @@ |
964 |
-# Copyright 2010-2019 Gentoo Authors |
965 |
+# Copyright 2010-2020 Gentoo Authors |
966 |
# Distributed under the terms of the GNU General Public License v2 |
967 |
|
968 |
"""Portability shim for xattr support |
969 |
@@ -11,8 +11,6 @@ See the standard xattr module for more documentation: |
970 |
https://pypi.python.org/pypi/pyxattr |
971 |
""" |
972 |
|
973 |
-from __future__ import print_function |
974 |
- |
975 |
import contextlib |
976 |
import os |
977 |
import subprocess |
978 |
diff --git a/lib/portage/util/locale.py b/lib/portage/util/locale.py |
979 |
index f7e99a4fd..99c8f7ae7 100644 |
980 |
--- a/lib/portage/util/locale.py |
981 |
+++ b/lib/portage/util/locale.py |
982 |
@@ -1,12 +1,12 @@ |
983 |
#-*- coding:utf-8 -*- |
984 |
-# Copyright 2015 Gentoo Foundation |
985 |
+# Copyright 2015-2020 Gentoo Authors |
986 |
# Distributed under the terms of the GNU General Public License v2 |
987 |
+ |
988 |
""" |
989 |
Function to check whether the current used LC_CTYPE handles case |
990 |
transformations of ASCII characters in a way compatible with the POSIX |
991 |
locale. |
992 |
""" |
993 |
-from __future__ import absolute_import |
994 |
|
995 |
import locale |
996 |
import logging |
997 |
diff --git a/lib/portage/util/movefile.py b/lib/portage/util/movefile.py |
998 |
index 3a17d5240..4f8054f29 100644 |
999 |
--- a/lib/portage/util/movefile.py |
1000 |
+++ b/lib/portage/util/movefile.py |
1001 |
@@ -1,8 +1,6 @@ |
1002 |
# Copyright 2010-2020 Gentoo Authors |
1003 |
# Distributed under the terms of the GNU General Public License v2 |
1004 |
|
1005 |
-from __future__ import absolute_import |
1006 |
- |
1007 |
__all__ = ['movefile'] |
1008 |
|
1009 |
import errno |
1010 |
diff --git a/repoman/bin/repoman b/repoman/bin/repoman |
1011 |
index 7f6187f12..29c630772 100755 |
1012 |
--- a/repoman/bin/repoman |
1013 |
+++ b/repoman/bin/repoman |
1014 |
@@ -1,14 +1,13 @@ |
1015 |
#!/usr/bin/env python |
1016 |
-# Copyright 1999-2017 Gentoo Foundation |
1017 |
+# Copyright 1999-2020 Gentoo Authors |
1018 |
# Distributed under the terms of the GNU General Public License v2 |
1019 |
|
1020 |
"""Ebuild and tree health checks and maintenance utilities. |
1021 |
""" |
1022 |
|
1023 |
-from __future__ import print_function |
1024 |
- |
1025 |
import sys |
1026 |
import errno |
1027 |
+ |
1028 |
# This block ensures that ^C interrupts are handled quietly. |
1029 |
try: |
1030 |
import signal |
1031 |
diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py |
1032 |
index 1afc4acb1..6f7313386 100644 |
1033 |
--- a/repoman/lib/repoman/actions.py |
1034 |
+++ b/repoman/lib/repoman/actions.py |
1035 |
@@ -1,9 +1,7 @@ |
1036 |
# -*- coding:utf-8 -*- |
1037 |
-# Copyright 1999-2019 Gentoo Authors |
1038 |
+# Copyright 1999-2020 Gentoo Authors |
1039 |
# Distributed under the terms of the GNU General Public License v2 |
1040 |
|
1041 |
-from __future__ import print_function |
1042 |
- |
1043 |
import errno |
1044 |
import io |
1045 |
import logging |
1046 |
diff --git a/repoman/lib/repoman/errors.py b/repoman/lib/repoman/errors.py |
1047 |
index 3509ecc06..2ea46803b 100644 |
1048 |
--- a/repoman/lib/repoman/errors.py |
1049 |
+++ b/repoman/lib/repoman/errors.py |
1050 |
@@ -1,7 +1,5 @@ |
1051 |
# -*- coding:utf-8 -*- |
1052 |
|
1053 |
-from __future__ import print_function |
1054 |
- |
1055 |
import sys |
1056 |
|
1057 |
|
1058 |
diff --git a/repoman/lib/repoman/gpg.py b/repoman/lib/repoman/gpg.py |
1059 |
index 4e55a6e37..ba16ab75b 100644 |
1060 |
--- a/repoman/lib/repoman/gpg.py |
1061 |
+++ b/repoman/lib/repoman/gpg.py |
1062 |
@@ -1,7 +1,5 @@ |
1063 |
# -*- coding:utf-8 -*- |
1064 |
|
1065 |
-from __future__ import print_function |
1066 |
- |
1067 |
import errno |
1068 |
import logging |
1069 |
import subprocess |
1070 |
diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py |
1071 |
index 38c6a1759..28a0d8a60 100755 |
1072 |
--- a/repoman/lib/repoman/main.py |
1073 |
+++ b/repoman/lib/repoman/main.py |
1074 |
@@ -1,16 +1,15 @@ |
1075 |
#!/usr/bin/env python |
1076 |
# -*- coding:utf-8 -*- |
1077 |
-# Copyright 1999-2017 Gentoo Foundation |
1078 |
+# Copyright 1999-2020 Gentoo Authors |
1079 |
# Distributed under the terms of the GNU General Public License v2 |
1080 |
|
1081 |
-from __future__ import print_function |
1082 |
- |
1083 |
import io |
1084 |
import logging |
1085 |
import sys |
1086 |
|
1087 |
# import our centrally initialized portage instance |
1088 |
from repoman._portage import portage |
1089 |
+ |
1090 |
portage._internal_caller = True |
1091 |
portage._disable_legacy_globals() |
1092 |
|
1093 |
diff --git a/repoman/lib/repoman/metadata.py b/repoman/lib/repoman/metadata.py |
1094 |
index 2aaedd4b0..f255a61e8 100644 |
1095 |
--- a/repoman/lib/repoman/metadata.py |
1096 |
+++ b/repoman/lib/repoman/metadata.py |
1097 |
@@ -1,7 +1,5 @@ |
1098 |
# -*- coding:utf-8 -*- |
1099 |
|
1100 |
-from __future__ import print_function |
1101 |
- |
1102 |
import errno |
1103 |
import logging |
1104 |
import sys |
1105 |
diff --git a/repoman/lib/repoman/modules/commit/repochecks.py b/repoman/lib/repoman/modules/commit/repochecks.py |
1106 |
index 523d414d2..1a287f978 100644 |
1107 |
--- a/repoman/lib/repoman/modules/commit/repochecks.py |
1108 |
+++ b/repoman/lib/repoman/modules/commit/repochecks.py |
1109 |
@@ -1,7 +1,5 @@ |
1110 |
# -*- coding:utf-8 -*- |
1111 |
|
1112 |
-from __future__ import print_function |
1113 |
- |
1114 |
from portage.output import red |
1115 |
|
1116 |
from repoman.errors import err |
1117 |
diff --git a/repoman/lib/repoman/modules/scan/ebuild/ebuild.py b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py |
1118 |
index 14d6178d7..87500d205 100644 |
1119 |
--- a/repoman/lib/repoman/modules/scan/ebuild/ebuild.py |
1120 |
+++ b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py |
1121 |
@@ -1,7 +1,5 @@ |
1122 |
# -*- coding:utf-8 -*- |
1123 |
|
1124 |
-from __future__ import print_function |
1125 |
- |
1126 |
import re |
1127 |
import stat |
1128 |
|
1129 |
@@ -11,6 +9,7 @@ from _emerge.RootConfig import RootConfig |
1130 |
from repoman.modules.scan.scanbase import ScanBase |
1131 |
# import our initialized portage instance |
1132 |
from repoman._portage import portage |
1133 |
+ |
1134 |
from portage import os |
1135 |
from portage.exception import InvalidPackageName |
1136 |
|
1137 |
diff --git a/repoman/lib/repoman/modules/vcs/settings.py b/repoman/lib/repoman/modules/vcs/settings.py |
1138 |
index f90f05963..2770e0331 100644 |
1139 |
--- a/repoman/lib/repoman/modules/vcs/settings.py |
1140 |
+++ b/repoman/lib/repoman/modules/vcs/settings.py |
1141 |
@@ -2,12 +2,11 @@ |
1142 |
Repoman VCSSettings modules |
1143 |
''' |
1144 |
|
1145 |
-from __future__ import print_function |
1146 |
- |
1147 |
import logging |
1148 |
import sys |
1149 |
|
1150 |
from portage.output import red |
1151 |
+ |
1152 |
from repoman.modules.vcs import module_controller, module_names |
1153 |
from repoman.modules.vcs.vcs import FindVCS |
1154 |
from repoman.qa_tracker import QATracker |
1155 |
diff --git a/repoman/lib/repoman/modules/vcs/vcs.py b/repoman/lib/repoman/modules/vcs/vcs.py |
1156 |
index b19f486a8..fbf99d458 100644 |
1157 |
--- a/repoman/lib/repoman/modules/vcs/vcs.py |
1158 |
+++ b/repoman/lib/repoman/modules/vcs/vcs.py |
1159 |
@@ -1,9 +1,8 @@ |
1160 |
# -*- coding:utf-8 -*- |
1161 |
|
1162 |
-from __future__ import print_function |
1163 |
- |
1164 |
import collections |
1165 |
import logging |
1166 |
+ |
1167 |
from itertools import chain |
1168 |
|
1169 |
from portage import os |
1170 |
diff --git a/repoman/lib/repoman/profile.py b/repoman/lib/repoman/profile.py |
1171 |
index b17389c55..2337522d3 100644 |
1172 |
--- a/repoman/lib/repoman/profile.py |
1173 |
+++ b/repoman/lib/repoman/profile.py |
1174 |
@@ -1,7 +1,5 @@ |
1175 |
# -*- coding:utf-8 -*- |
1176 |
|
1177 |
-from __future__ import print_function |
1178 |
- |
1179 |
from portage import normalize_path |
1180 |
from portage import os |
1181 |
from portage.output import red |
1182 |
diff --git a/repoman/lib/repoman/scanner.py b/repoman/lib/repoman/scanner.py |
1183 |
index 8d2ce9052..f9df73d83 100644 |
1184 |
--- a/repoman/lib/repoman/scanner.py |
1185 |
+++ b/repoman/lib/repoman/scanner.py |
1186 |
@@ -1,16 +1,16 @@ |
1187 |
# -*- coding:utf-8 -*- |
1188 |
|
1189 |
-from __future__ import print_function |
1190 |
- |
1191 |
import logging |
1192 |
+import portage |
1193 |
+ |
1194 |
from itertools import chain |
1195 |
|
1196 |
-import portage |
1197 |
from portage import normalize_path |
1198 |
from portage import os |
1199 |
from portage._sets.base import InternalPackageSet |
1200 |
from portage.output import green |
1201 |
from portage.util.futures.extendedfutures import ExtendedFuture |
1202 |
+ |
1203 |
from repoman.metadata import get_metadata_xsd |
1204 |
from repoman.modules.commit import repochecks |
1205 |
from repoman.modules.commit import manifest |
1206 |
diff --git a/repoman/lib/repoman/tests/__init__.py b/repoman/lib/repoman/tests/__init__.py |
1207 |
index 48c52c499..85c6f0b54 100644 |
1208 |
--- a/repoman/lib/repoman/tests/__init__.py |
1209 |
+++ b/repoman/lib/repoman/tests/__init__.py |
1210 |
@@ -1,9 +1,7 @@ |
1211 |
# tests/__init__.py -- Portage Unit Test functionality |
1212 |
-# Copyright 2006-2013 Gentoo Foundation |
1213 |
+# Copyright 2006-2020 Gentoo Authors |
1214 |
# Distributed under the terms of the GNU General Public License v2 |
1215 |
|
1216 |
-from __future__ import print_function |
1217 |
- |
1218 |
import argparse |
1219 |
import sys |
1220 |
import time |
1221 |
diff --git a/repoman/lib/repoman/utilities.py b/repoman/lib/repoman/utilities.py |
1222 |
index 2d25fd309..c4c292227 100644 |
1223 |
--- a/repoman/lib/repoman/utilities.py |
1224 |
+++ b/repoman/lib/repoman/utilities.py |
1225 |
@@ -1,13 +1,11 @@ |
1226 |
# -*- coding:utf-8 -*- |
1227 |
# repoman: Utilities |
1228 |
-# Copyright 2007-2018 Gentoo Foundation |
1229 |
+# Copyright 2007-2020 Gentoo Authors |
1230 |
# Distributed under the terms of the GNU General Public License v2 |
1231 |
|
1232 |
"""This module contains utility functions to help repoman find ebuilds to |
1233 |
scan""" |
1234 |
|
1235 |
-from __future__ import print_function |
1236 |
- |
1237 |
__all__ = [ |
1238 |
"editor_is_executable", |
1239 |
"FindPackagesToScan", |
1240 |
diff --git a/repoman/runtests b/repoman/runtests |
1241 |
index bbda4526f..3edaaf0a8 100755 |
1242 |
--- a/repoman/runtests |
1243 |
+++ b/repoman/runtests |
1244 |
@@ -1,5 +1,5 @@ |
1245 |
#!/usr/bin/env python |
1246 |
-# Copyright 2010-2017 Gentoo Foundation |
1247 |
+# Copyright 2010-2020 Gentoo Authors |
1248 |
# Distributed under the terms of the GNU General Public License v2 |
1249 |
# |
1250 |
# Note: We don't want to import portage modules directly because we do things |
1251 |
@@ -11,8 +11,6 @@ Note: Any additional arguments will be passed down directly to the underlying |
1252 |
unittest runner. This lets you select specific tests to execute. |
1253 |
""" |
1254 |
|
1255 |
-from __future__ import print_function |
1256 |
- |
1257 |
import argparse |
1258 |
import os |
1259 |
import shutil |
1260 |
diff --git a/repoman/setup.py b/repoman/setup.py |
1261 |
index f2664fae4..5fcfe12e6 100755 |
1262 |
--- a/repoman/setup.py |
1263 |
+++ b/repoman/setup.py |
1264 |
@@ -1,9 +1,7 @@ |
1265 |
#!/usr/bin/env python |
1266 |
-# Copyright 1998-2014 Gentoo Foundation |
1267 |
+# Copyright 1998-2020 Gentoo Authors |
1268 |
# Distributed under the terms of the GNU General Public License v2 |
1269 |
|
1270 |
-from __future__ import print_function |
1271 |
- |
1272 |
from distutils.core import setup, Command |
1273 |
from distutils.command.build import build |
1274 |
from distutils.command.build_scripts import build_scripts |
1275 |
diff --git a/runtests b/runtests |
1276 |
index 8cbd9620f..685a7d9c7 100755 |
1277 |
--- a/runtests |
1278 |
+++ b/runtests |
1279 |
@@ -1,5 +1,5 @@ |
1280 |
#!/usr/bin/python |
1281 |
-# Copyright 2010-2015 Gentoo Foundation |
1282 |
+# Copyright 2010-2020 Gentoo Authors |
1283 |
# Distributed under the terms of the GNU General Public License v2 |
1284 |
# |
1285 |
# Note: We don't want to import portage modules directly because we do things |
1286 |
@@ -11,8 +11,6 @@ Note: Any additional arguments will be passed down directly to the underlying |
1287 |
unittest runner. This lets you select specific tests to execute. |
1288 |
""" |
1289 |
|
1290 |
-from __future__ import print_function |
1291 |
- |
1292 |
import argparse |
1293 |
import os |
1294 |
import shutil |
1295 |
diff --git a/setup.py b/setup.py |
1296 |
index bef5c31fa..c016db98d 100755 |
1297 |
--- a/setup.py |
1298 |
+++ b/setup.py |
1299 |
@@ -2,8 +2,6 @@ |
1300 |
# Copyright 1998-2020 Gentoo Authors |
1301 |
# Distributed under the terms of the GNU General Public License v2 |
1302 |
|
1303 |
-from __future__ import print_function |
1304 |
- |
1305 |
from distutils.core import setup, Command, Extension |
1306 |
from distutils.command.build import build |
1307 |
from distutils.command.build_ext import build_ext as _build_ext |
1308 |
-- |
1309 |
2.28.0 |