1 |
gentoolkit supports only Python 3.6+ now, so these are not used. |
2 |
|
3 |
Signed-off-by: Matt Turner <mattst88@g.o> |
4 |
--- |
5 |
bin/eclean | 3 --- |
6 |
bin/eclean-dist | 3 --- |
7 |
bin/eclean-pkg | 3 --- |
8 |
bin/ekeyword | 2 -- |
9 |
bin/enalyze | 2 -- |
10 |
bin/epkginfo | 2 -- |
11 |
bin/equery | 2 -- |
12 |
bin/euse | 8 ++++---- |
13 |
bin/imlate | 2 -- |
14 |
bin/revdep-rebuild | 2 -- |
15 |
pym/gentoolkit/base.py | 2 -- |
16 |
pym/gentoolkit/dbapi.py | 2 -- |
17 |
pym/gentoolkit/eclean/clean.py | 3 --- |
18 |
pym/gentoolkit/eclean/cli.py | 3 --- |
19 |
pym/gentoolkit/eclean/exclude.py | 3 --- |
20 |
pym/gentoolkit/eclean/output.py | 3 --- |
21 |
pym/gentoolkit/eclean/pkgindex.py | 3 --- |
22 |
pym/gentoolkit/eclean/search.py | 3 --- |
23 |
pym/gentoolkit/ekeyword/ekeyword.py | 2 -- |
24 |
pym/gentoolkit/ekeyword/ekeyword_unittest.py | 2 -- |
25 |
pym/gentoolkit/enalyze/analyze.py | 2 -- |
26 |
pym/gentoolkit/enalyze/output.py | 2 -- |
27 |
pym/gentoolkit/enalyze/rebuild.py | 3 --- |
28 |
pym/gentoolkit/eprefix.py | 2 -- |
29 |
pym/gentoolkit/equery/__init__.py | 2 -- |
30 |
pym/gentoolkit/equery/belongs.py | 2 -- |
31 |
pym/gentoolkit/equery/changes.py | 2 -- |
32 |
pym/gentoolkit/equery/check.py | 2 -- |
33 |
pym/gentoolkit/equery/depends.py | 2 -- |
34 |
pym/gentoolkit/equery/depgraph.py | 2 -- |
35 |
pym/gentoolkit/equery/files.py | 2 -- |
36 |
pym/gentoolkit/equery/has.py | 2 -- |
37 |
pym/gentoolkit/equery/hasuse.py | 2 -- |
38 |
pym/gentoolkit/equery/list_.py | 2 -- |
39 |
pym/gentoolkit/equery/meta.py | 2 -- |
40 |
pym/gentoolkit/equery/size.py | 2 -- |
41 |
pym/gentoolkit/equery/uses.py | 2 -- |
42 |
pym/gentoolkit/equery/which.py | 2 -- |
43 |
pym/gentoolkit/eshowkw/keywords_header.py | 2 -- |
44 |
pym/gentoolkit/imlate/imlate.py | 3 --- |
45 |
pym/gentoolkit/module_base.py | 2 -- |
46 |
pym/gentoolkit/revdep_rebuild/analyse.py | 2 -- |
47 |
pym/gentoolkit/revdep_rebuild/assign.py | 2 -- |
48 |
pym/gentoolkit/revdep_rebuild/cache.py | 2 -- |
49 |
pym/gentoolkit/revdep_rebuild/collect.py | 2 -- |
50 |
pym/gentoolkit/revdep_rebuild/rebuild.py | 2 -- |
51 |
pym/gentoolkit/revdep_rebuild/settings.py | 2 -- |
52 |
pym/gentoolkit/revdep_rebuild/stuff.py | 2 -- |
53 |
pym/gentoolkit/test/eclean/creator.py | 3 --- |
54 |
pym/gentoolkit/test/eclean/distsupport.py | 2 -- |
55 |
pym/gentoolkit/test/eclean/test_clean.py | 2 -- |
56 |
pym/gentoolkit/test/eclean/test_search.py | 3 --- |
57 |
setup.py | 3 --- |
58 |
53 files changed, 4 insertions(+), 122 deletions(-) |
59 |
|
60 |
diff --git a/bin/eclean b/bin/eclean |
61 |
index 715787b..90f9e55 100755 |
62 |
--- a/bin/eclean |
63 |
+++ b/bin/eclean |
64 |
@@ -4,9 +4,6 @@ |
65 |
Distributed under the terms of the GNU General Public License v2 |
66 |
""" |
67 |
|
68 |
-from __future__ import print_function |
69 |
- |
70 |
- |
71 |
# Meta: |
72 |
__author__ = "Thomas de Grenier de Latour (tgl), " + \ |
73 |
"modular re-write by: Brian Dolbec (dol-sen)" |
74 |
diff --git a/bin/eclean-dist b/bin/eclean-dist |
75 |
index 715787b..90f9e55 100755 |
76 |
--- a/bin/eclean-dist |
77 |
+++ b/bin/eclean-dist |
78 |
@@ -4,9 +4,6 @@ |
79 |
Distributed under the terms of the GNU General Public License v2 |
80 |
""" |
81 |
|
82 |
-from __future__ import print_function |
83 |
- |
84 |
- |
85 |
# Meta: |
86 |
__author__ = "Thomas de Grenier de Latour (tgl), " + \ |
87 |
"modular re-write by: Brian Dolbec (dol-sen)" |
88 |
diff --git a/bin/eclean-pkg b/bin/eclean-pkg |
89 |
index 715787b..90f9e55 100755 |
90 |
--- a/bin/eclean-pkg |
91 |
+++ b/bin/eclean-pkg |
92 |
@@ -4,9 +4,6 @@ |
93 |
Distributed under the terms of the GNU General Public License v2 |
94 |
""" |
95 |
|
96 |
-from __future__ import print_function |
97 |
- |
98 |
- |
99 |
# Meta: |
100 |
__author__ = "Thomas de Grenier de Latour (tgl), " + \ |
101 |
"modular re-write by: Brian Dolbec (dol-sen)" |
102 |
diff --git a/bin/ekeyword b/bin/ekeyword |
103 |
index 72b3f95..2e3c78e 100755 |
104 |
--- a/bin/ekeyword |
105 |
+++ b/bin/ekeyword |
106 |
@@ -13,8 +13,6 @@ the current list as they appear, and ebuilds are processed as they appear. |
107 |
|
108 |
""" |
109 |
|
110 |
-from __future__ import print_function |
111 |
- |
112 |
import os |
113 |
import sys |
114 |
# This block ensures that ^C interrupts are handled quietly. |
115 |
diff --git a/bin/enalyze b/bin/enalyze |
116 |
index 5991f60..a0bb29a 100755 |
117 |
--- a/bin/enalyze |
118 |
+++ b/bin/enalyze |
119 |
@@ -12,8 +12,6 @@ packages that use them. It can also be used to help rebuild /etc/portage/packag |
120 |
files in the event of corruption, and possibly more. |
121 |
""" |
122 |
|
123 |
-from __future__ import print_function |
124 |
- |
125 |
import sys |
126 |
# This block ensures that ^C interrupts are handled quietly. |
127 |
try: |
128 |
diff --git a/bin/epkginfo b/bin/epkginfo |
129 |
index 75a2f3f..4f87176 100755 |
130 |
--- a/bin/epkginfo |
131 |
+++ b/bin/epkginfo |
132 |
@@ -7,8 +7,6 @@ |
133 |
|
134 |
"""Shortcut to equery meta""" |
135 |
|
136 |
-from __future__ import print_function |
137 |
- |
138 |
__authors__ = ( |
139 |
'Douglas Anderson <douglasjanderson@×××××.com>: equery meta', |
140 |
'Ned Ludd <solar@g.o>: first full implimentation' |
141 |
diff --git a/bin/equery b/bin/equery |
142 |
index 292321e..77371d1 100755 |
143 |
--- a/bin/equery |
144 |
+++ b/bin/equery |
145 |
@@ -10,8 +10,6 @@ information about packages, such as the files they own, their USE flags, |
146 |
the MD5 sum of each file owned by a given package, and many other things. |
147 |
""" |
148 |
|
149 |
-from __future__ import print_function |
150 |
- |
151 |
import os |
152 |
import sys |
153 |
# This block ensures that ^C interrupts are handled quietly. |
154 |
diff --git a/bin/euse b/bin/euse |
155 |
index 15a2a6e..263d0f2 100755 |
156 |
--- a/bin/euse |
157 |
+++ b/bin/euse |
158 |
@@ -184,7 +184,7 @@ VER |
159 |
# worth another look to avoid calling python unnecessariy. Or we could |
160 |
# just write the whole thing in python. ;) |
161 |
reduce_incrementals() { |
162 |
- echo $@ | python -c "from __future__ import print_function;import sys |
163 |
+ echo $@ | python -c "import sys |
164 |
r=[] |
165 |
for x in sys.stdin.read().split(): |
166 |
if x[0] == '-' and x[1:] in r: |
167 |
@@ -202,7 +202,7 @@ print(' '.join(r))" |
168 |
# Similar to reduce_incrementals but negative flags trump positive |
169 |
# flags, regardless of which follows which |
170 |
reduce_incrementals_trump() { |
171 |
- echo $@ | python -c "from __future__ import print_function;import sys |
172 |
+ echo $@ | python -c "import sys |
173 |
r=[] |
174 |
for x in sys.stdin.read().split(): |
175 |
if x[0] == '-' and x[1:] in r: |
176 |
@@ -221,7 +221,7 @@ print(' '.join(r))" |
177 |
# * - Lines of package atom followed by flags |
178 |
# (app-editors/vim flag1 flag2 -flag3) |
179 |
reduce_package_use() { |
180 |
- echo "${@}" | python -c "from __future__ import print_function;import sys,re |
181 |
+ echo "${@}" | python -c "import sys,re |
182 |
h={}; getflags=re.compile(r'(-?[\w*-]+)') |
183 |
for x in sys.stdin.read().split('\n'): |
184 |
if not x: continue |
185 |
@@ -541,7 +541,7 @@ get_flagstatus_helper_pkg() { |
186 |
if [[ -z "${atoms[@]/[<>=]*/}" ]]; then |
187 |
atoms=($( |
188 |
echo "${atoms[@]}" | python -c " |
189 |
-from __future__ import print_function;import portage.dep as dep, sys |
190 |
+import portage.dep as dep, sys |
191 |
print(' '.join(dep.match_to_list('$5-$6',sys.stdin.read().split())))")) |
192 |
fi |
193 |
flags=$(for atom in ${atoms[@]}; do |
194 |
diff --git a/bin/imlate b/bin/imlate |
195 |
index d186f0d..040d19e 100755 |
196 |
--- a/bin/imlate |
197 |
+++ b/bin/imlate |
198 |
@@ -13,8 +13,6 @@ the current list as they appear, and ebuilds are processed as they appear. |
199 |
|
200 |
""" |
201 |
|
202 |
-from __future__ import print_function |
203 |
- |
204 |
import os |
205 |
import sys |
206 |
# This block ensures that ^C interrupts are handled quietly. |
207 |
diff --git a/bin/revdep-rebuild b/bin/revdep-rebuild |
208 |
index b77ebe9..24d349e 100755 |
209 |
--- a/bin/revdep-rebuild |
210 |
+++ b/bin/revdep-rebuild |
211 |
@@ -11,8 +11,6 @@ those broken binaries and shared libraries. It is useful when an upgraded packag |
212 |
dependent upon the upgraded package. |
213 |
""" |
214 |
|
215 |
-from __future__ import print_function |
216 |
- |
217 |
import sys |
218 |
# This block ensures that ^C interrupts are handled quietly. |
219 |
try: |
220 |
diff --git a/pym/gentoolkit/base.py b/pym/gentoolkit/base.py |
221 |
index bc08561..aabccea 100644 |
222 |
--- a/pym/gentoolkit/base.py |
223 |
+++ b/pym/gentoolkit/base.py |
224 |
@@ -8,8 +8,6 @@ |
225 |
"""Gentoolkit Base Module class to hold common module operation functions |
226 |
""" |
227 |
|
228 |
-from __future__ import print_function |
229 |
- |
230 |
__docformat__ = 'epytext' |
231 |
|
232 |
|
233 |
diff --git a/pym/gentoolkit/dbapi.py b/pym/gentoolkit/dbapi.py |
234 |
index 113545d..4768078 100644 |
235 |
--- a/pym/gentoolkit/dbapi.py |
236 |
+++ b/pym/gentoolkit/dbapi.py |
237 |
@@ -11,8 +11,6 @@ |
238 |
take advantage of them being lazy-loaded. |
239 |
""" |
240 |
|
241 |
-from __future__ import print_function |
242 |
- |
243 |
print("gentoolkit.dbapi is deprecated.\n", |
244 |
"Please migrate to using the assigned calls directly") |
245 |
|
246 |
diff --git a/pym/gentoolkit/eclean/clean.py b/pym/gentoolkit/eclean/clean.py |
247 |
index c62abb9..2b750e3 100644 |
248 |
--- a/pym/gentoolkit/eclean/clean.py |
249 |
+++ b/pym/gentoolkit/eclean/clean.py |
250 |
@@ -4,9 +4,6 @@ |
251 |
# Distributed under the terms of the GNU General Public License v2 |
252 |
|
253 |
|
254 |
-from __future__ import print_function |
255 |
- |
256 |
- |
257 |
import os |
258 |
import sys |
259 |
|
260 |
diff --git a/pym/gentoolkit/eclean/cli.py b/pym/gentoolkit/eclean/cli.py |
261 |
index 39aafd3..e31fde9 100644 |
262 |
--- a/pym/gentoolkit/eclean/cli.py |
263 |
+++ b/pym/gentoolkit/eclean/cli.py |
264 |
@@ -4,9 +4,6 @@ |
265 |
# Distributed under the terms of the GNU General Public License v2 |
266 |
|
267 |
|
268 |
-from __future__ import print_function |
269 |
- |
270 |
- |
271 |
__author__ = "Thomas de Grenier de Latour (tgl), " + \ |
272 |
"modular re-write by: Brian Dolbec (dol-sen)" |
273 |
__email__ = "degrenier@×××××××××××.fr, " + \ |
274 |
diff --git a/pym/gentoolkit/eclean/exclude.py b/pym/gentoolkit/eclean/exclude.py |
275 |
index c734493..ee5e1e1 100644 |
276 |
--- a/pym/gentoolkit/eclean/exclude.py |
277 |
+++ b/pym/gentoolkit/eclean/exclude.py |
278 |
@@ -4,9 +4,6 @@ |
279 |
# Distributed under the terms of the GNU General Public License v2 |
280 |
|
281 |
|
282 |
-from __future__ import print_function |
283 |
- |
284 |
- |
285 |
import os |
286 |
import sys |
287 |
if sys.hexversion < 0x3000000: |
288 |
diff --git a/pym/gentoolkit/eclean/output.py b/pym/gentoolkit/eclean/output.py |
289 |
index 93662d6..122d550 100644 |
290 |
--- a/pym/gentoolkit/eclean/output.py |
291 |
+++ b/pym/gentoolkit/eclean/output.py |
292 |
@@ -4,9 +4,6 @@ |
293 |
# Distributed under the terms of the GNU General Public License v2 |
294 |
|
295 |
|
296 |
-from __future__ import print_function |
297 |
- |
298 |
- |
299 |
import sys |
300 |
from portage.output import blue, yellow, teal, green, red |
301 |
from gentoolkit.pprinter import cpv, number |
302 |
diff --git a/pym/gentoolkit/eclean/pkgindex.py b/pym/gentoolkit/eclean/pkgindex.py |
303 |
index c1f5f9d..6cf9000 100644 |
304 |
--- a/pym/gentoolkit/eclean/pkgindex.py |
305 |
+++ b/pym/gentoolkit/eclean/pkgindex.py |
306 |
@@ -3,9 +3,6 @@ |
307 |
# Copyright 2003-2010 Gentoo Foundation |
308 |
# Distributed under the terms of the GNU General Public License v2 |
309 |
|
310 |
-from __future__ import print_function |
311 |
- |
312 |
- |
313 |
import subprocess |
314 |
import os |
315 |
import sys |
316 |
diff --git a/pym/gentoolkit/eclean/search.py b/pym/gentoolkit/eclean/search.py |
317 |
index f68aacf..992949c 100644 |
318 |
--- a/pym/gentoolkit/eclean/search.py |
319 |
+++ b/pym/gentoolkit/eclean/search.py |
320 |
@@ -4,9 +4,6 @@ |
321 |
# Distributed under the terms of the GNU General Public License v2 |
322 |
|
323 |
|
324 |
-from __future__ import print_function |
325 |
- |
326 |
- |
327 |
import os |
328 |
import stat |
329 |
import sys |
330 |
diff --git a/pym/gentoolkit/ekeyword/ekeyword.py b/pym/gentoolkit/ekeyword/ekeyword.py |
331 |
index a86a9c2..4e57c09 100755 |
332 |
--- a/pym/gentoolkit/ekeyword/ekeyword.py |
333 |
+++ b/pym/gentoolkit/ekeyword/ekeyword.py |
334 |
@@ -36,8 +36,6 @@ Examples: |
335 |
$ %(prog)s s390=amd64 foo-1.ebuild |
336 |
""" |
337 |
|
338 |
-from __future__ import print_function |
339 |
- |
340 |
import argparse |
341 |
import collections |
342 |
import difflib |
343 |
diff --git a/pym/gentoolkit/ekeyword/ekeyword_unittest.py b/pym/gentoolkit/ekeyword/ekeyword_unittest.py |
344 |
index 7446914..ef2e256 100755 |
345 |
--- a/pym/gentoolkit/ekeyword/ekeyword_unittest.py |
346 |
+++ b/pym/gentoolkit/ekeyword/ekeyword_unittest.py |
347 |
@@ -5,8 +5,6 @@ |
348 |
|
349 |
"""Unittests for ekeyword""" |
350 |
|
351 |
-from __future__ import print_function |
352 |
- |
353 |
import os |
354 |
import subprocess |
355 |
import tempfile |
356 |
diff --git a/pym/gentoolkit/enalyze/analyze.py b/pym/gentoolkit/enalyze/analyze.py |
357 |
index 1d3d9c0..30ffa93 100644 |
358 |
--- a/pym/gentoolkit/enalyze/analyze.py |
359 |
+++ b/pym/gentoolkit/enalyze/analyze.py |
360 |
@@ -8,8 +8,6 @@ |
361 |
"""Provides a breakdown list of USE flags or keywords used and by |
362 |
what packages according to the Installed package database""" |
363 |
|
364 |
-from __future__ import print_function |
365 |
- |
366 |
import gentoolkit |
367 |
from gentoolkit.module_base import ModuleBase |
368 |
from gentoolkit import pprinter as pp |
369 |
diff --git a/pym/gentoolkit/enalyze/output.py b/pym/gentoolkit/enalyze/output.py |
370 |
index 3d63394..993565a 100644 |
371 |
--- a/pym/gentoolkit/enalyze/output.py |
372 |
+++ b/pym/gentoolkit/enalyze/output.py |
373 |
@@ -8,8 +8,6 @@ |
374 |
both screen and file output |
375 |
""" |
376 |
|
377 |
-from __future__ import print_function |
378 |
- |
379 |
import time |
380 |
|
381 |
from gentoolkit import pprinter as pp |
382 |
diff --git a/pym/gentoolkit/enalyze/rebuild.py b/pym/gentoolkit/enalyze/rebuild.py |
383 |
index d6ccef9..4ad571f 100644 |
384 |
--- a/pym/gentoolkit/enalyze/rebuild.py |
385 |
+++ b/pym/gentoolkit/enalyze/rebuild.py |
386 |
@@ -10,9 +10,6 @@ |
387 |
what packages according to the Installed package database""" |
388 |
|
389 |
|
390 |
-from __future__ import print_function |
391 |
- |
392 |
- |
393 |
import os |
394 |
import sys |
395 |
if sys.hexversion < 0x3000000: |
396 |
diff --git a/pym/gentoolkit/eprefix.py b/pym/gentoolkit/eprefix.py |
397 |
index 48bd140..5acaa79 100644 |
398 |
--- a/pym/gentoolkit/eprefix.py |
399 |
+++ b/pym/gentoolkit/eprefix.py |
400 |
@@ -4,8 +4,6 @@ |
401 |
# Distributed under the terms of the GNU General Public License v2 |
402 |
|
403 |
|
404 |
-#from __future__ import print_function |
405 |
- |
406 |
"""Eprefix support module to set the EPREFIX variable |
407 |
used in all gentoolkit modules |
408 |
|
409 |
diff --git a/pym/gentoolkit/equery/__init__.py b/pym/gentoolkit/equery/__init__.py |
410 |
index f33cca5..6167710 100644 |
411 |
--- a/pym/gentoolkit/equery/__init__.py |
412 |
+++ b/pym/gentoolkit/equery/__init__.py |
413 |
@@ -6,8 +6,6 @@ |
414 |
|
415 |
"""Gentoo package query tool""" |
416 |
|
417 |
-from __future__ import print_function |
418 |
- |
419 |
__all__ = ( |
420 |
'format_options', |
421 |
'format_package_names', |
422 |
diff --git a/pym/gentoolkit/equery/belongs.py b/pym/gentoolkit/equery/belongs.py |
423 |
index 8c16b89..cf53916 100644 |
424 |
--- a/pym/gentoolkit/equery/belongs.py |
425 |
+++ b/pym/gentoolkit/equery/belongs.py |
426 |
@@ -10,8 +10,6 @@ Note: Normally, only one package will own a file. If multiple packages own |
427 |
the same file, it usually constitutes a problem, and should be reported. |
428 |
""" |
429 |
|
430 |
-from __future__ import print_function |
431 |
- |
432 |
__docformat__ = 'epytext' |
433 |
|
434 |
# ======= |
435 |
diff --git a/pym/gentoolkit/equery/changes.py b/pym/gentoolkit/equery/changes.py |
436 |
index 92e81b5..f86edf6 100644 |
437 |
--- a/pym/gentoolkit/equery/changes.py |
438 |
+++ b/pym/gentoolkit/equery/changes.py |
439 |
@@ -6,8 +6,6 @@ |
440 |
|
441 |
"""Displays the ChangeLog entry for the latest installable version of an atom""" |
442 |
|
443 |
-from __future__ import print_function |
444 |
- |
445 |
__docformat__ = 'epytext' |
446 |
|
447 |
# ======= |
448 |
diff --git a/pym/gentoolkit/equery/check.py b/pym/gentoolkit/equery/check.py |
449 |
index d5a22a3..c00789b 100644 |
450 |
--- a/pym/gentoolkit/equery/check.py |
451 |
+++ b/pym/gentoolkit/equery/check.py |
452 |
@@ -6,8 +6,6 @@ |
453 |
|
454 |
"""Checks timestamps and MD5 sums for files owned by a given installed package""" |
455 |
|
456 |
-from __future__ import print_function |
457 |
- |
458 |
__docformat__ = 'epytext' |
459 |
|
460 |
# ======= |
461 |
diff --git a/pym/gentoolkit/equery/depends.py b/pym/gentoolkit/equery/depends.py |
462 |
index 8ffc745..e654e84 100644 |
463 |
--- a/pym/gentoolkit/equery/depends.py |
464 |
+++ b/pym/gentoolkit/equery/depends.py |
465 |
@@ -6,8 +6,6 @@ |
466 |
|
467 |
"""List all packages that depend on a atom given query""" |
468 |
|
469 |
-from __future__ import print_function |
470 |
- |
471 |
__docformat__ = 'epytext' |
472 |
|
473 |
# ======= |
474 |
diff --git a/pym/gentoolkit/equery/depgraph.py b/pym/gentoolkit/equery/depgraph.py |
475 |
index 9fbdd42..9ad21c2 100644 |
476 |
--- a/pym/gentoolkit/equery/depgraph.py |
477 |
+++ b/pym/gentoolkit/equery/depgraph.py |
478 |
@@ -6,8 +6,6 @@ |
479 |
|
480 |
"""Display a direct dependency graph for a given package""" |
481 |
|
482 |
-from __future__ import print_function |
483 |
- |
484 |
__docformat__ = 'epytext' |
485 |
|
486 |
# ======= |
487 |
diff --git a/pym/gentoolkit/equery/files.py b/pym/gentoolkit/equery/files.py |
488 |
index 10c7fde..05c2235 100644 |
489 |
--- a/pym/gentoolkit/equery/files.py |
490 |
+++ b/pym/gentoolkit/equery/files.py |
491 |
@@ -6,8 +6,6 @@ |
492 |
|
493 |
"""List files owned by a given package.""" |
494 |
|
495 |
-from __future__ import print_function |
496 |
- |
497 |
__docformat__ = 'epytext' |
498 |
|
499 |
# ======= |
500 |
diff --git a/pym/gentoolkit/equery/has.py b/pym/gentoolkit/equery/has.py |
501 |
index 37e4d3f..dddaab3 100644 |
502 |
--- a/pym/gentoolkit/equery/has.py |
503 |
+++ b/pym/gentoolkit/equery/has.py |
504 |
@@ -6,8 +6,6 @@ |
505 |
|
506 |
"""List all installed packages that match for a given ENVIRONMENT variable""" |
507 |
|
508 |
-from __future__ import print_function |
509 |
- |
510 |
__docformat__ = 'epytext' |
511 |
|
512 |
# ======= |
513 |
diff --git a/pym/gentoolkit/equery/hasuse.py b/pym/gentoolkit/equery/hasuse.py |
514 |
index aa47974..5ec8244 100644 |
515 |
--- a/pym/gentoolkit/equery/hasuse.py |
516 |
+++ b/pym/gentoolkit/equery/hasuse.py |
517 |
@@ -6,8 +6,6 @@ |
518 |
|
519 |
"""List all installed packages that have a given USE flag""" |
520 |
|
521 |
-from __future__ import print_function |
522 |
- |
523 |
__docformat__ = 'epytext' |
524 |
|
525 |
# ======= |
526 |
diff --git a/pym/gentoolkit/equery/list_.py b/pym/gentoolkit/equery/list_.py |
527 |
index c547ac3..dca14b1 100644 |
528 |
--- a/pym/gentoolkit/equery/list_.py |
529 |
+++ b/pym/gentoolkit/equery/list_.py |
530 |
@@ -6,8 +6,6 @@ |
531 |
|
532 |
"""List installed packages matching the query pattern""" |
533 |
|
534 |
-from __future__ import print_function |
535 |
- |
536 |
__docformat__ = 'epytext' |
537 |
|
538 |
# ======= |
539 |
diff --git a/pym/gentoolkit/equery/meta.py b/pym/gentoolkit/equery/meta.py |
540 |
index 2e8f91e..aa1de6a 100644 |
541 |
--- a/pym/gentoolkit/equery/meta.py |
542 |
+++ b/pym/gentoolkit/equery/meta.py |
543 |
@@ -6,8 +6,6 @@ |
544 |
|
545 |
"""Display metadata about a given package.""" |
546 |
|
547 |
-from __future__ import print_function |
548 |
- |
549 |
__docformat__ = 'epytext' |
550 |
|
551 |
# ======= |
552 |
diff --git a/pym/gentoolkit/equery/size.py b/pym/gentoolkit/equery/size.py |
553 |
index 4151767..ee63c0b 100644 |
554 |
--- a/pym/gentoolkit/equery/size.py |
555 |
+++ b/pym/gentoolkit/equery/size.py |
556 |
@@ -6,8 +6,6 @@ |
557 |
|
558 |
"""Print total size of files contained in a given package""" |
559 |
|
560 |
-from __future__ import print_function |
561 |
- |
562 |
__docformat__ = 'epytext' |
563 |
|
564 |
# ======= |
565 |
diff --git a/pym/gentoolkit/equery/uses.py b/pym/gentoolkit/equery/uses.py |
566 |
index e565b0d..e344e62 100644 |
567 |
--- a/pym/gentoolkit/equery/uses.py |
568 |
+++ b/pym/gentoolkit/equery/uses.py |
569 |
@@ -6,8 +6,6 @@ |
570 |
|
571 |
"""Display USE flags for a given package""" |
572 |
|
573 |
-from __future__ import print_function |
574 |
- |
575 |
__docformat__ = 'epytext' |
576 |
|
577 |
# ======= |
578 |
diff --git a/pym/gentoolkit/equery/which.py b/pym/gentoolkit/equery/which.py |
579 |
index a071801..ba3547c 100644 |
580 |
--- a/pym/gentoolkit/equery/which.py |
581 |
+++ b/pym/gentoolkit/equery/which.py |
582 |
@@ -8,8 +8,6 @@ |
583 |
configuration |
584 |
""" |
585 |
|
586 |
-from __future__ import print_function |
587 |
- |
588 |
__docformat__ = 'epytext' |
589 |
|
590 |
# ======= |
591 |
diff --git a/pym/gentoolkit/eshowkw/keywords_header.py b/pym/gentoolkit/eshowkw/keywords_header.py |
592 |
index 31261dc..00ecb27 100644 |
593 |
--- a/pym/gentoolkit/eshowkw/keywords_header.py |
594 |
+++ b/pym/gentoolkit/eshowkw/keywords_header.py |
595 |
@@ -2,8 +2,6 @@ |
596 |
# Copyright 2001-2018 Gentoo Foundation |
597 |
# Distributed under the terms of the GNU General Public License v2 |
598 |
|
599 |
-from __future__ import print_function |
600 |
- |
601 |
__all__ = ['keywords_header'] |
602 |
|
603 |
from portage import settings as ports |
604 |
diff --git a/pym/gentoolkit/imlate/imlate.py b/pym/gentoolkit/imlate/imlate.py |
605 |
index 40e2914..3e22791 100755 |
606 |
--- a/pym/gentoolkit/imlate/imlate.py |
607 |
+++ b/pym/gentoolkit/imlate/imlate.py |
608 |
@@ -4,9 +4,6 @@ |
609 |
# $Id$ |
610 |
# Author: Christian Ruppert <idl0r@g.o> |
611 |
|
612 |
-# Python 2.6 compatibility |
613 |
-from __future__ import print_function |
614 |
- |
615 |
__version__ = "git" |
616 |
|
617 |
# works just with stable keywords! |
618 |
diff --git a/pym/gentoolkit/module_base.py b/pym/gentoolkit/module_base.py |
619 |
index e5d79e4..9f6ad91 100644 |
620 |
--- a/pym/gentoolkit/module_base.py |
621 |
+++ b/pym/gentoolkit/module_base.py |
622 |
@@ -9,8 +9,6 @@ |
623 |
"""General Base Module class to hold common module operation functions |
624 |
""" |
625 |
|
626 |
-from __future__ import print_function |
627 |
- |
628 |
__docformat__ = 'epytext' |
629 |
|
630 |
|
631 |
diff --git a/pym/gentoolkit/revdep_rebuild/analyse.py b/pym/gentoolkit/revdep_rebuild/analyse.py |
632 |
index 6ca3f10..4269ade 100644 |
633 |
--- a/pym/gentoolkit/revdep_rebuild/analyse.py |
634 |
+++ b/pym/gentoolkit/revdep_rebuild/analyse.py |
635 |
@@ -2,8 +2,6 @@ |
636 |
|
637 |
"""Analysis module""" |
638 |
|
639 |
-from __future__ import print_function |
640 |
- |
641 |
import os |
642 |
import re |
643 |
import time |
644 |
diff --git a/pym/gentoolkit/revdep_rebuild/assign.py b/pym/gentoolkit/revdep_rebuild/assign.py |
645 |
index 48c8c93..1e5f3e9 100644 |
646 |
--- a/pym/gentoolkit/revdep_rebuild/assign.py |
647 |
+++ b/pym/gentoolkit/revdep_rebuild/assign.py |
648 |
@@ -4,8 +4,6 @@ |
649 |
Functions used for determining the package the broken lib belongs to. |
650 |
""" |
651 |
|
652 |
-from __future__ import print_function |
653 |
- |
654 |
import errno |
655 |
import os |
656 |
import io |
657 |
diff --git a/pym/gentoolkit/revdep_rebuild/cache.py b/pym/gentoolkit/revdep_rebuild/cache.py |
658 |
index ec9f168..66fbd9d 100644 |
659 |
--- a/pym/gentoolkit/revdep_rebuild/cache.py |
660 |
+++ b/pym/gentoolkit/revdep_rebuild/cache.py |
661 |
@@ -3,8 +3,6 @@ |
662 |
Functions for reading, saving and verifying the data caches |
663 |
""" |
664 |
|
665 |
-from __future__ import print_function |
666 |
- |
667 |
from portage import os |
668 |
import time |
669 |
import sys |
670 |
diff --git a/pym/gentoolkit/revdep_rebuild/collect.py b/pym/gentoolkit/revdep_rebuild/collect.py |
671 |
index cbac878..9f7d301 100644 |
672 |
--- a/pym/gentoolkit/revdep_rebuild/collect.py |
673 |
+++ b/pym/gentoolkit/revdep_rebuild/collect.py |
674 |
@@ -2,8 +2,6 @@ |
675 |
|
676 |
"""Data collection module""" |
677 |
|
678 |
-from __future__ import print_function |
679 |
- |
680 |
import re |
681 |
from portage import os |
682 |
import glob |
683 |
diff --git a/pym/gentoolkit/revdep_rebuild/rebuild.py b/pym/gentoolkit/revdep_rebuild/rebuild.py |
684 |
index 3f152e7..4109c4f 100644 |
685 |
--- a/pym/gentoolkit/revdep_rebuild/rebuild.py |
686 |
+++ b/pym/gentoolkit/revdep_rebuild/rebuild.py |
687 |
@@ -14,8 +14,6 @@ Creation date: 2010/10/17 |
688 |
License: BSD |
689 |
""" |
690 |
|
691 |
-from __future__ import print_function |
692 |
- |
693 |
import os |
694 |
import sys |
695 |
import logging |
696 |
diff --git a/pym/gentoolkit/revdep_rebuild/settings.py b/pym/gentoolkit/revdep_rebuild/settings.py |
697 |
index 718fee7..efdb975 100644 |
698 |
--- a/pym/gentoolkit/revdep_rebuild/settings.py |
699 |
+++ b/pym/gentoolkit/revdep_rebuild/settings.py |
700 |
@@ -2,8 +2,6 @@ |
701 |
|
702 |
"""Default settings""" |
703 |
|
704 |
-from __future__ import print_function |
705 |
- |
706 |
import argparse |
707 |
import os |
708 |
import sys |
709 |
diff --git a/pym/gentoolkit/revdep_rebuild/stuff.py b/pym/gentoolkit/revdep_rebuild/stuff.py |
710 |
index 002eb4b..432dc8f 100644 |
711 |
--- a/pym/gentoolkit/revdep_rebuild/stuff.py |
712 |
+++ b/pym/gentoolkit/revdep_rebuild/stuff.py |
713 |
@@ -3,8 +3,6 @@ |
714 |
"""Utilities submodule""" |
715 |
|
716 |
|
717 |
-from __future__ import print_function |
718 |
- |
719 |
import subprocess |
720 |
|
721 |
import portage |
722 |
diff --git a/pym/gentoolkit/test/eclean/creator.py b/pym/gentoolkit/test/eclean/creator.py |
723 |
index de50426..1c46b2d 100644 |
724 |
--- a/pym/gentoolkit/test/eclean/creator.py |
725 |
+++ b/pym/gentoolkit/test/eclean/creator.py |
726 |
@@ -6,9 +6,6 @@ |
727 |
# |
728 |
# $Header$ |
729 |
|
730 |
-from __future__ import with_statement |
731 |
-from __future__ import print_function |
732 |
- |
733 |
import os |
734 |
import sys |
735 |
if sys.hexversion < 0x3000000: |
736 |
diff --git a/pym/gentoolkit/test/eclean/distsupport.py b/pym/gentoolkit/test/eclean/distsupport.py |
737 |
index 78016ba..0f52238 100644 |
738 |
--- a/pym/gentoolkit/test/eclean/distsupport.py |
739 |
+++ b/pym/gentoolkit/test/eclean/distsupport.py |
740 |
@@ -6,8 +6,6 @@ |
741 |
# $Header$ |
742 |
|
743 |
|
744 |
-from __future__ import print_function |
745 |
- |
746 |
import re |
747 |
import os |
748 |
from tempfile import mkdtemp |
749 |
diff --git a/pym/gentoolkit/test/eclean/test_clean.py b/pym/gentoolkit/test/eclean/test_clean.py |
750 |
index 0fc9469..08c1be8 100755 |
751 |
--- a/pym/gentoolkit/test/eclean/test_clean.py |
752 |
+++ b/pym/gentoolkit/test/eclean/test_clean.py |
753 |
@@ -6,8 +6,6 @@ |
754 |
# |
755 |
# $Header$ |
756 |
|
757 |
-from __future__ import print_function |
758 |
- |
759 |
__version__= "0.0.1" |
760 |
__author__ = "Brian Dolbec" |
761 |
__email__ = "brian.dolbec@×××××.com" |
762 |
diff --git a/pym/gentoolkit/test/eclean/test_search.py b/pym/gentoolkit/test/eclean/test_search.py |
763 |
index 6dc26a2..ac6a886 100755 |
764 |
--- a/pym/gentoolkit/test/eclean/test_search.py |
765 |
+++ b/pym/gentoolkit/test/eclean/test_search.py |
766 |
@@ -9,9 +9,6 @@ |
767 |
# $Header$ |
768 |
|
769 |
|
770 |
-from __future__ import print_function |
771 |
- |
772 |
- |
773 |
import unittest |
774 |
import re |
775 |
import os |
776 |
diff --git a/setup.py b/setup.py |
777 |
index 777b7f3..a9cd80c 100755 |
778 |
--- a/setup.py |
779 |
+++ b/setup.py |
780 |
@@ -1,8 +1,5 @@ |
781 |
#!/usr/bin/env python |
782 |
|
783 |
-from __future__ import print_function |
784 |
- |
785 |
- |
786 |
import re |
787 |
import sys |
788 |
import subprocess |
789 |
-- |
790 |
2.26.2 |