ib/portage/tests/glsa/test_security_set.py lib/portage/tests/resolver/test_profile_default_eapi.py lib/portage/tests/resolver/test_profile_package_set.py lib/portage/tests/unicode/test_string_format.py lib/portage/update.py lib/portage/util/__init__.py lib/portage/util/_dyn_libs/NeededEntry.py lib/portage/util/_dyn_libs/soname_deps.py lib/portage/util/digraph.py lib/portage/util/futures/extendedfutures.py lib/portage/util/futures/futures.py lib/portage/util/locale.py lib/portage/util/movefile.py lib/portage/util/writeable_check.py lib/portage/versions.py lib/portage/xml/metadata.py repoman/lib/repoman/actions.py repoman/lib/repoman/errors.py repoman/lib/repoman/gpg.py repoman/lib/repoman/main.py repoman/lib/repoman/metadata.py repoman/lib/repoman/modules/commit/repochecks.py repoman/lib/repoman/modules/linechecks/config.py repoman/lib/repoman/modules/scan/ebuild/ebuild.py repoman/lib/repoman/modules/vcs/settings.py repoman/lib/repoman/modules/vcs/vcs.py repoman/lib/repoman/profile.py repoman/lib/repoman/scanner.py repoman/lib/repoman/utilities.py X-VCS-Directories: lib/portage/package/ebuild/_config/ lib/portage/dep/soname/ lib/portage/util/ lib/portage/ repoman/lib/repoman/modules/commit/ lib/portage/sync/ lib/portage/util/_dyn_libs/ lib/portage/tests/ebuild/ lib/portage/tests/emerge/ repoman/lib/repoman/modules/linechecks/ lib/portage/package/ebuild/_ipc/ lib/portage/package/ebuild/ lib/portage/tests/dbapi/ lib/portage/cache/index/ lib/portage/tests/glsa/ lib/portage/tests/resolver/ lib/portage/elog/ lib/portage/util/futures/ lib/portage/repository/ repoman/lib/repoman/modules/scan/ebuild/ lib/portage/dbapi/ bin/ lib/portage/tests/unicode/ repoman/lib/repoman/modules/vcs/ lib/portage/cache/ lib/portage/dep/ repoman/lib/repoman/ lib/_emerge/ lib/portage/tests/dep/ lib/portage/xml/ lib/_emerge/resolver/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 788c0e8bb07b40d45bee243f563267444af791ac X-VCS-Branch: master Date: Thu, 16 Jul 2020 00:24:44 +0000 (UTC)
commit: 788c0e8bb07b40d45bee243f563267444af791ac Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Thu Jul 16 00:09:44 2020 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Thu Jul 16 00:09:55 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=788c0e8b Remove from __future__ import unicode_literals Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> bin/dispatch-conf | 2 +- bin/dohtml.py | 2 +- bin/egencache | 2 +- bin/glsa-check | 2 +- bin/portageq | 2 +- lib/_emerge/DependencyArg.py | 2 -- lib/_emerge/EbuildBuild.py | 2 -- lib/_emerge/EbuildPhase.py | 2 -- lib/_emerge/FakeVartree.py | 2 -- lib/_emerge/JobStatusDisplay.py | 2 -- lib/_emerge/Package.py | 2 -- lib/_emerge/Scheduler.py | 2 +- lib/_emerge/UseFlagDisplay.py | 2 -- lib/_emerge/UserQuery.py | 2 +- lib/_emerge/actions.py | 2 +- lib/_emerge/depgraph.py | 2 +- lib/_emerge/emergelog.py | 2 -- lib/_emerge/resolver/circular_dependency.py | 2 +- lib/_emerge/resolver/output.py | 2 -- lib/_emerge/resolver/output_helpers.py | 2 -- lib/_emerge/resolver/slot_collision.py | 2 +- lib/_emerge/search.py | 2 -- lib/portage/__init__.py | 2 -- lib/portage/cache/flat_hash.py | 2 -- lib/portage/cache/index/pkg_desc_index.py | 2 -- lib/portage/cache/sqlite.py | 2 +- lib/portage/const.py | 2 -- lib/portage/dbapi/__init__.py | 2 -- lib/portage/dbapi/_expand_new_virt.py | 2 -- lib/portage/dbapi/bintree.py | 2 -- lib/portage/dbapi/cpv_expand.py | 2 -- lib/portage/dbapi/dep_expand.py | 2 -- lib/portage/dbapi/porttree.py | 2 -- lib/portage/dbapi/vartree.py | 2 +- lib/portage/dbapi/virtual.py | 2 -- lib/portage/dep/__init__.py | 2 -- lib/portage/dep/_dnf.py | 2 -- lib/portage/dep/_slot_operator.py | 2 -- lib/portage/dep/dep_check.py | 2 -- lib/portage/dep/soname/SonameAtom.py | 2 -- lib/portage/dep/soname/multilib_category.py | 2 -- lib/portage/dep/soname/parse.py | 2 -- lib/portage/dispatch_conf.py | 2 +- lib/portage/eclass_cache.py | 2 -- lib/portage/elog/mod_save_summary.py | 2 -- lib/portage/getbinpkg.py | 2 -- lib/portage/glsa.py | 2 +- lib/portage/manifest.py | 2 -- lib/portage/news.py | 2 +- lib/portage/package/ebuild/_config/LocationsManager.py | 2 -- lib/portage/package/ebuild/_config/special_env_vars.py | 2 -- lib/portage/package/ebuild/_ipc/QueryCommand.py | 2 -- lib/portage/package/ebuild/config.py | 2 -- lib/portage/package/ebuild/doebuild.py | 2 -- lib/portage/package/ebuild/getmaskingstatus.py | 2 -- lib/portage/package/ebuild/prepare_build_dirs.py | 2 -- lib/portage/repository/config.py | 2 -- lib/portage/sync/syncbase.py | 2 -- lib/portage/tests/dbapi/test_auxdb.py | 2 -- lib/portage/tests/dep/test_soname_atom_pickle.py | 2 -- lib/portage/tests/ebuild/test_config.py | 2 -- lib/portage/tests/ebuild/test_fetch.py | 2 -- lib/portage/tests/ebuild/test_use_expand_incremental.py | 2 -- lib/portage/tests/emerge/test_config_protect.py | 2 -- lib/portage/tests/glsa/test_security_set.py | 2 -- lib/portage/tests/resolver/test_profile_default_eapi.py | 2 -- lib/portage/tests/resolver/test_profile_package_set.py | 2 -- lib/portage/tests/unicode/test_string_format.py | 2 -- lib/portage/update.py | 2 -- lib/portage/util/__init__.py | 2 -- lib/portage/util/_dyn_libs/NeededEntry.py | 2 -- lib/portage/util/_dyn_libs/soname_deps.py | 2 -- lib/portage/util/digraph.py | 2 -- lib/portage/util/futures/extendedfutures.py | 2 -- lib/portage/util/futures/futures.py | 2 -- lib/portage/util/locale.py | 2 +- lib/portage/util/movefile.py | 2 +- lib/portage/util/writeable_check.py | 2 -- lib/portage/versions.py | 2 -- lib/portage/xml/metadata.py | 2 -- repoman/lib/repoman/actions.py | 2 +- repoman/lib/repoman/errors.py | 2 +- repoman/lib/repoman/gpg.py | 2 +- repoman/lib/repoman/main.py | 2 +- repoman/lib/repoman/metadata.py | 2 +- repoman/lib/repoman/modules/commit/repochecks.py | 2 +- repoman/lib/repoman/modules/linechecks/config.py | 2 -- repoman/lib/repoman/modules/scan/ebuild/ebuild.py | 2 +- repoman/lib/repoman/modules/vcs/settings.py | 2 +- repoman/lib/repoman/modules/vcs/vcs.py | 2 +- repoman/lib/repoman/profile.py | 2 +- repoman/lib/repoman/scanner.py | 2 +- repoman/lib/repoman/utilities.py | 2 +- 93 files changed, 30 insertions(+), 156 deletions(-) diff --git a/bin/dispatch-conf b/bin/dispatch-conf index 62ab3f6cc..1759b89b8 100755 --- a/bin/dispatch-conf +++ b/bin/dispatch-conf @@ -11,7 +11,7 @@ # dialog menus # -from __future__ import print_function, unicode_literals +from __future__ import print_function import atexit import io diff --git a/bin/dohtml.py b/bin/dohtml.py index dfcaa6026..df8552b83 100755 --- a/bin/dohtml.py +++ b/bin/dohtml.py @@ -28,7 +28,7 @@ # - will do as 'dohtml -r', but ignore directories named CVS, SCCS, RCS # -from __future__ import print_function, unicode_literals +from __future__ import print_function import os as _os import sys diff --git a/bin/egencache b/bin/egencache index d172319f8..02084cc55 100755 --- a/bin/egencache +++ b/bin/egencache @@ -3,7 +3,7 @@ # Distributed under the terms of the GNU General Public License v2 # unicode_literals for compat with TextIOWrapper in Python 2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import argparse import platform diff --git a/bin/glsa-check b/bin/glsa-check index eff01cf31..468436353 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -2,7 +2,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import argparse import re diff --git a/bin/portageq b/bin/portageq index 3be5ab584..f8fc236d1 100755 --- a/bin/portageq +++ b/bin/portageq @@ -2,7 +2,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import argparse import signal diff --git a/lib/_emerge/DependencyArg.py b/lib/_emerge/DependencyArg.py index 29a0072c4..87f255f10 100644 --- a/lib/_emerge/DependencyArg.py +++ b/lib/_emerge/DependencyArg.py @@ -1,8 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys from portage import _encodings, _unicode_encode diff --git a/lib/_emerge/EbuildBuild.py b/lib/_emerge/EbuildBuild.py index ab5a4da74..a575835b7 100644 --- a/lib/_emerge/EbuildBuild.py +++ b/lib/_emerge/EbuildBuild.py @@ -1,8 +1,6 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import functools import io diff --git a/lib/_emerge/EbuildPhase.py b/lib/_emerge/EbuildPhase.py index 92335b6c0..e6256d0aa 100644 --- a/lib/_emerge/EbuildPhase.py +++ b/lib/_emerge/EbuildPhase.py @@ -1,8 +1,6 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import functools import gzip import io diff --git a/lib/_emerge/FakeVartree.py b/lib/_emerge/FakeVartree.py index 3f82e97e9..029aa0ce8 100644 --- a/lib/_emerge/FakeVartree.py +++ b/lib/_emerge/FakeVartree.py @@ -1,8 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys import warnings diff --git a/lib/_emerge/JobStatusDisplay.py b/lib/_emerge/JobStatusDisplay.py index b8e142af9..c44d2ab19 100644 --- a/lib/_emerge/JobStatusDisplay.py +++ b/lib/_emerge/JobStatusDisplay.py @@ -1,8 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import sys import time diff --git a/lib/_emerge/Package.py b/lib/_emerge/Package.py index 3d7df2437..b1abfb744 100644 --- a/lib/_emerge/Package.py +++ b/lib/_emerge/Package.py @@ -1,8 +1,6 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import functools import sys from itertools import chain diff --git a/lib/_emerge/Scheduler.py b/lib/_emerge/Scheduler.py index 6f4564000..4d77d2ab3 100644 --- a/lib/_emerge/Scheduler.py +++ b/lib/_emerge/Scheduler.py @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import division, print_function, unicode_literals +from __future__ import division, print_function from collections import deque import gc diff --git a/lib/_emerge/UseFlagDisplay.py b/lib/_emerge/UseFlagDisplay.py index 12820e9d1..c16e7ba0d 100644 --- a/lib/_emerge/UseFlagDisplay.py +++ b/lib/_emerge/UseFlagDisplay.py @@ -1,8 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import collections from itertools import chain import sys diff --git a/lib/_emerge/UserQuery.py b/lib/_emerge/UserQuery.py index e20bbc6c3..faa32cf50 100644 --- a/lib/_emerge/UserQuery.py +++ b/lib/_emerge/UserQuery.py @@ -1,7 +1,7 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import signal import sys diff --git a/lib/_emerge/actions.py b/lib/_emerge/actions.py index 392f98d4d..554e60944 100644 --- a/lib/_emerge/actions.py +++ b/lib/_emerge/actions.py @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import division, print_function, unicode_literals +from __future__ import division, print_function import collections import errno diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py index ec90e59df..795cf69d6 100644 --- a/lib/_emerge/depgraph.py +++ b/lib/_emerge/depgraph.py @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import division, print_function, unicode_literals +from __future__ import division, print_function import collections import errno diff --git a/lib/_emerge/emergelog.py b/lib/_emerge/emergelog.py index cba98f395..be4ccfe35 100644 --- a/lib/_emerge/emergelog.py +++ b/lib/_emerge/emergelog.py @@ -1,8 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import sys import time diff --git a/lib/_emerge/resolver/circular_dependency.py b/lib/_emerge/resolver/circular_dependency.py index 5c119567b..866e278dd 100644 --- a/lib/_emerge/resolver/circular_dependency.py +++ b/lib/_emerge/resolver/circular_dependency.py @@ -1,7 +1,7 @@ # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function from itertools import chain, product import logging diff --git a/lib/_emerge/resolver/output.py b/lib/_emerge/resolver/output.py index ed88cc51f..29fd034e9 100644 --- a/lib/_emerge/resolver/output.py +++ b/lib/_emerge/resolver/output.py @@ -4,8 +4,6 @@ """Resolver output display operation. """ -from __future__ import unicode_literals - __all__ = ( "Display", "format_unmatched_atom", ) diff --git a/lib/_emerge/resolver/output_helpers.py b/lib/_emerge/resolver/output_helpers.py index b83717e93..2d4fd788c 100644 --- a/lib/_emerge/resolver/output_helpers.py +++ b/lib/_emerge/resolver/output_helpers.py @@ -5,8 +5,6 @@ in output.py """ -from __future__ import unicode_literals - __all__ = ( ) diff --git a/lib/_emerge/resolver/slot_collision.py b/lib/_emerge/resolver/slot_collision.py index 682a3a0a5..be584ec39 100644 --- a/lib/_emerge/resolver/slot_collision.py +++ b/lib/_emerge/resolver/slot_collision.py @@ -1,7 +1,7 @@ # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import sys diff --git a/lib/_emerge/search.py b/lib/_emerge/search.py index be639dfa3..d8050b46f 100644 --- a/lib/_emerge/search.py +++ b/lib/_emerge/search.py @@ -1,8 +1,6 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import difflib import re import portage diff --git a/lib/portage/__init__.py b/lib/portage/__init__.py index 60dbea693..5ac01c8df 100644 --- a/lib/portage/__init__.py +++ b/lib/portage/__init__.py @@ -1,8 +1,6 @@ # Copyright 1998-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - VERSION = "HEAD" # =========================================================================== diff --git a/lib/portage/cache/flat_hash.py b/lib/portage/cache/flat_hash.py index 451ea9e51..3b8bf0bdc 100644 --- a/lib/portage/cache/flat_hash.py +++ b/lib/portage/cache/flat_hash.py @@ -2,8 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # Author(s): Brian Harring ([email protected]) -from __future__ import unicode_literals - from portage.cache import fs_template from portage.cache import cache_errors import errno diff --git a/lib/portage/cache/index/pkg_desc_index.py b/lib/portage/cache/index/pkg_desc_index.py index dbcbb8313..ca2002914 100644 --- a/lib/portage/cache/index/pkg_desc_index.py +++ b/lib/portage/cache/index/pkg_desc_index.py @@ -1,8 +1,6 @@ # Copyright 2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import collections import sys diff --git a/lib/portage/cache/sqlite.py b/lib/portage/cache/sqlite.py index 69150f679..c2175d51b 100644 --- a/lib/portage/cache/sqlite.py +++ b/lib/portage/cache/sqlite.py @@ -1,7 +1,7 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import division, unicode_literals +from __future__ import division import re import sys diff --git a/lib/portage/const.py b/lib/portage/const.py index f6be9258f..9a7ea23bd 100644 --- a/lib/portage/const.py +++ b/lib/portage/const.py @@ -2,8 +2,6 @@ # Copyright 1998-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import os # =========================================================================== diff --git a/lib/portage/dbapi/__init__.py b/lib/portage/dbapi/__init__.py index 37728714e..f74cd946c 100644 --- a/lib/portage/dbapi/__init__.py +++ b/lib/portage/dbapi/__init__.py @@ -1,8 +1,6 @@ # Copyright 1998-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ["dbapi"] import functools diff --git a/lib/portage/dbapi/_expand_new_virt.py b/lib/portage/dbapi/_expand_new_virt.py index 9aa603d11..0edfb2ae2 100644 --- a/lib/portage/dbapi/_expand_new_virt.py +++ b/lib/portage/dbapi/_expand_new_virt.py @@ -1,8 +1,6 @@ # Copyright 2011-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import portage from portage.dep import Atom, _get_useflag_re from portage.eapi import _get_eapi_attrs diff --git a/lib/portage/dbapi/bintree.py b/lib/portage/dbapi/bintree.py index 311c9a78a..337b69d46 100644 --- a/lib/portage/dbapi/bintree.py +++ b/lib/portage/dbapi/bintree.py @@ -1,8 +1,6 @@ # Copyright 1998-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ["bindbapi", "binarytree"] import portage diff --git a/lib/portage/dbapi/cpv_expand.py b/lib/portage/dbapi/cpv_expand.py index ac2f6cc2e..88e43f24e 100644 --- a/lib/portage/dbapi/cpv_expand.py +++ b/lib/portage/dbapi/cpv_expand.py @@ -1,8 +1,6 @@ # Copyright 2010-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ["cpv_expand"] import portage diff --git a/lib/portage/dbapi/dep_expand.py b/lib/portage/dbapi/dep_expand.py index 9515b7dec..fab5fa830 100644 --- a/lib/portage/dbapi/dep_expand.py +++ b/lib/portage/dbapi/dep_expand.py @@ -1,8 +1,6 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ["dep_expand"] import re diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py index ed992d1e2..0bc190411 100644 --- a/lib/portage/dbapi/porttree.py +++ b/lib/portage/dbapi/porttree.py @@ -1,8 +1,6 @@ # Copyright 1998-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = [ "close_portdbapi_caches", "FetchlistDict", "portagetree", "portdbapi" ] diff --git a/lib/portage/dbapi/vartree.py b/lib/portage/dbapi/vartree.py index 80ca0ab80..4ae443e29 100644 --- a/lib/portage/dbapi/vartree.py +++ b/lib/portage/dbapi/vartree.py @@ -1,7 +1,7 @@ # Copyright 1998-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import division, unicode_literals +from __future__ import division __all__ = [ "vardbapi", "vartree", "dblink"] + \ diff --git a/lib/portage/dbapi/virtual.py b/lib/portage/dbapi/virtual.py index 3f7e6c221..c172e976d 100644 --- a/lib/portage/dbapi/virtual.py +++ b/lib/portage/dbapi/virtual.py @@ -1,8 +1,6 @@ # Copyright 1998-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - from portage.dbapi import dbapi from portage.dbapi.dep_expand import dep_expand from portage.versions import cpv_getkey, _pkg_str diff --git a/lib/portage/dep/__init__.py b/lib/portage/dep/__init__.py index 314338f7c..75e19c1b8 100644 --- a/lib/portage/dep/__init__.py +++ b/lib/portage/dep/__init__.py @@ -2,8 +2,6 @@ # Copyright 2003-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = [ 'Atom', 'best_match_to_list', 'cpvequal', 'dep_getcpv', 'dep_getkey', 'dep_getslot', diff --git a/lib/portage/dep/_dnf.py b/lib/portage/dep/_dnf.py index 59657fd6a..90c662242 100644 --- a/lib/portage/dep/_dnf.py +++ b/lib/portage/dep/_dnf.py @@ -1,8 +1,6 @@ # Copyright 2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import itertools diff --git a/lib/portage/dep/_slot_operator.py b/lib/portage/dep/_slot_operator.py index a9f74382c..29bf8e1b1 100644 --- a/lib/portage/dep/_slot_operator.py +++ b/lib/portage/dep/_slot_operator.py @@ -1,8 +1,6 @@ # Copyright 2012-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - from portage.dep import Atom, paren_enclose, use_reduce from portage.eapi import _get_eapi_attrs from portage.exception import InvalidData diff --git a/lib/portage/dep/dep_check.py b/lib/portage/dep/dep_check.py index 9534590bf..7b2c804bc 100644 --- a/lib/portage/dep/dep_check.py +++ b/lib/portage/dep/dep_check.py @@ -1,8 +1,6 @@ # Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['dep_check', 'dep_eval', 'dep_wordreduce', 'dep_zapdeps'] import collections diff --git a/lib/portage/dep/soname/SonameAtom.py b/lib/portage/dep/soname/SonameAtom.py index 5743544aa..12d79386b 100644 --- a/lib/portage/dep/soname/SonameAtom.py +++ b/lib/portage/dep/soname/SonameAtom.py @@ -1,8 +1,6 @@ # Copyright 2015-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys from portage import _encodings, _unicode_encode diff --git a/lib/portage/dep/soname/multilib_category.py b/lib/portage/dep/soname/multilib_category.py index 37af98705..301c62a35 100644 --- a/lib/portage/dep/soname/multilib_category.py +++ b/lib/portage/dep/soname/multilib_category.py @@ -32,8 +32,6 @@ # for given installation, we are only interested in tracking multilib # ABIs for a single OS. -from __future__ import unicode_literals - from portage.util.elf.constants import ( EF_MIPS_ABI, EF_MIPS_ABI2, diff --git a/lib/portage/dep/soname/parse.py b/lib/portage/dep/soname/parse.py index 3f3757209..d83ff12d9 100644 --- a/lib/portage/dep/soname/parse.py +++ b/lib/portage/dep/soname/parse.py @@ -1,8 +1,6 @@ # Copyright 2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - from portage.exception import InvalidData from portage.localization import _ from portage.dep.soname.SonameAtom import SonameAtom diff --git a/lib/portage/dispatch_conf.py b/lib/portage/dispatch_conf.py index 2fab19f1a..89ede2711 100644 --- a/lib/portage/dispatch_conf.py +++ b/lib/portage/dispatch_conf.py @@ -6,7 +6,7 @@ # Library by Wayne Davison <[email protected]>, derived from code # written by Jeremy Wohl (http://igmus.org) -from __future__ import print_function, unicode_literals +from __future__ import print_function import errno import io diff --git a/lib/portage/eclass_cache.py b/lib/portage/eclass_cache.py index d2d9e2710..549f96643 100644 --- a/lib/portage/eclass_cache.py +++ b/lib/portage/eclass_cache.py @@ -2,8 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 # Author(s): Nicholas Carpaski ([email protected]), Brian Harring ([email protected]) -from __future__ import unicode_literals - __all__ = ["cache"] import stat diff --git a/lib/portage/elog/mod_save_summary.py b/lib/portage/elog/mod_save_summary.py index e4924b66b..48c006037 100644 --- a/lib/portage/elog/mod_save_summary.py +++ b/lib/portage/elog/mod_save_summary.py @@ -2,8 +2,6 @@ # Copyright 2006-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import errno import io import sys diff --git a/lib/portage/getbinpkg.py b/lib/portage/getbinpkg.py index 14dc149b1..cfeba8192 100644 --- a/lib/portage/getbinpkg.py +++ b/lib/portage/getbinpkg.py @@ -2,8 +2,6 @@ # Copyright 2003-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - from portage.output import colorize from portage.cache.mappings import slot_dict_class from portage.localization import _ diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py index 3fd877b22..11420b46c 100644 --- a/lib/portage/glsa.py +++ b/lib/portage/glsa.py @@ -1,7 +1,7 @@ # Copyright 2003-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import import io import sys diff --git a/lib/portage/manifest.py b/lib/portage/manifest.py index 4bca61e86..a71973c26 100644 --- a/lib/portage/manifest.py +++ b/lib/portage/manifest.py @@ -1,8 +1,6 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import errno import io import logging diff --git a/lib/portage/news.py b/lib/portage/news.py index f7c8c7bb9..908a0224b 100644 --- a/lib/portage/news.py +++ b/lib/portage/news.py @@ -2,7 +2,7 @@ # Copyright 2006-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function __all__ = ["NewsManager", "NewsItem", "DisplayRestriction", "DisplayProfileRestriction", "DisplayKeywordRestriction", diff --git a/lib/portage/package/ebuild/_config/LocationsManager.py b/lib/portage/package/ebuild/_config/LocationsManager.py index 75320258f..14eb8f257 100644 --- a/lib/portage/package/ebuild/_config/LocationsManager.py +++ b/lib/portage/package/ebuild/_config/LocationsManager.py @@ -1,8 +1,6 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ( 'LocationsManager', ) diff --git a/lib/portage/package/ebuild/_config/special_env_vars.py b/lib/portage/package/ebuild/_config/special_env_vars.py index f44cb9b1b..8b65762ea 100644 --- a/lib/portage/package/ebuild/_config/special_env_vars.py +++ b/lib/portage/package/ebuild/_config/special_env_vars.py @@ -1,8 +1,6 @@ # Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ( 'case_insensitive_vars', 'default_globals', 'env_blacklist', \ 'environ_filter', 'environ_whitelist', 'environ_whitelist_re', diff --git a/lib/portage/package/ebuild/_ipc/QueryCommand.py b/lib/portage/package/ebuild/_ipc/QueryCommand.py index fa6d1ea16..e58909a2a 100644 --- a/lib/portage/package/ebuild/_ipc/QueryCommand.py +++ b/lib/portage/package/ebuild/_ipc/QueryCommand.py @@ -1,8 +1,6 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import portage diff --git a/lib/portage/package/ebuild/config.py b/lib/portage/package/ebuild/config.py index 47c180c12..e108db04d 100644 --- a/lib/portage/package/ebuild/config.py +++ b/lib/portage/package/ebuild/config.py @@ -1,8 +1,6 @@ # Copyright 2010-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = [ 'autouse', 'best_from_dict', 'check_config_instance', 'config', ] diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py index 2bff94cb1..df220fb0a 100644 --- a/lib/portage/package/ebuild/doebuild.py +++ b/lib/portage/package/ebuild/doebuild.py @@ -1,8 +1,6 @@ # Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['doebuild', 'doebuild_environment', 'spawn', 'spawnebuild'] import grp diff --git a/lib/portage/package/ebuild/getmaskingstatus.py b/lib/portage/package/ebuild/getmaskingstatus.py index 4b9e588f7..34e65dd00 100644 --- a/lib/portage/package/ebuild/getmaskingstatus.py +++ b/lib/portage/package/ebuild/getmaskingstatus.py @@ -1,8 +1,6 @@ # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['getmaskingstatus'] import sys diff --git a/lib/portage/package/ebuild/prepare_build_dirs.py b/lib/portage/package/ebuild/prepare_build_dirs.py index 8349d306f..b63cd89fa 100644 --- a/lib/portage/package/ebuild/prepare_build_dirs.py +++ b/lib/portage/package/ebuild/prepare_build_dirs.py @@ -1,8 +1,6 @@ # Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['prepare_build_dirs'] import errno diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py index 3a5425be7..8531748fa 100644 --- a/lib/portage/repository/config.py +++ b/lib/portage/repository/config.py @@ -1,8 +1,6 @@ # Copyright 2010-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import logging import warnings diff --git a/lib/portage/sync/syncbase.py b/lib/portage/sync/syncbase.py index 74818a420..8ad0b5ae7 100644 --- a/lib/portage/sync/syncbase.py +++ b/lib/portage/sync/syncbase.py @@ -6,8 +6,6 @@ Base class for performing sync operations. This class contains common initialization code and functions. ''' -from __future__ import unicode_literals -import functools import logging import os diff --git a/lib/portage/tests/dbapi/test_auxdb.py b/lib/portage/tests/dbapi/test_auxdb.py index 85d64c15e..5c79357d7 100644 --- a/lib/portage/tests/dbapi/test_auxdb.py +++ b/lib/portage/tests/dbapi/test_auxdb.py @@ -1,8 +1,6 @@ # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - from portage.tests import TestCase from portage.tests.resolver.ResolverPlayground import ResolverPlayground from portage.util.futures import asyncio diff --git a/lib/portage/tests/dep/test_soname_atom_pickle.py b/lib/portage/tests/dep/test_soname_atom_pickle.py index c3f339e2d..14755440c 100644 --- a/lib/portage/tests/dep/test_soname_atom_pickle.py +++ b/lib/portage/tests/dep/test_soname_atom_pickle.py @@ -1,8 +1,6 @@ # Copyright 2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys from portage.dep.soname.SonameAtom import SonameAtom diff --git a/lib/portage/tests/ebuild/test_config.py b/lib/portage/tests/ebuild/test_config.py index dcb5ffe0d..60f3ecab4 100644 --- a/lib/portage/tests/ebuild/test_config.py +++ b/lib/portage/tests/ebuild/test_config.py @@ -1,8 +1,6 @@ # Copyright 2010-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import tempfile diff --git a/lib/portage/tests/ebuild/test_fetch.py b/lib/portage/tests/ebuild/test_fetch.py index 9a8a4a544..232f78b5e 100644 --- a/lib/portage/tests/ebuild/test_fetch.py +++ b/lib/portage/tests/ebuild/test_fetch.py @@ -1,8 +1,6 @@ # Copyright 2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import functools import io import tempfile diff --git a/lib/portage/tests/ebuild/test_use_expand_incremental.py b/lib/portage/tests/ebuild/test_use_expand_incremental.py index a58f08cb9..4e83e4f85 100644 --- a/lib/portage/tests/ebuild/test_use_expand_incremental.py +++ b/lib/portage/tests/ebuild/test_use_expand_incremental.py @@ -1,8 +1,6 @@ # Copyright 2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io from portage import os, _encodings diff --git a/lib/portage/tests/emerge/test_config_protect.py b/lib/portage/tests/emerge/test_config_protect.py index 06ab059ee..f88cb3b7b 100644 --- a/lib/portage/tests/emerge/test_config_protect.py +++ b/lib/portage/tests/emerge/test_config_protect.py @@ -1,8 +1,6 @@ # Copyright 2014-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io from functools import partial import shutil diff --git a/lib/portage/tests/glsa/test_security_set.py b/lib/portage/tests/glsa/test_security_set.py index a602f83d4..025fcd864 100644 --- a/lib/portage/tests/glsa/test_security_set.py +++ b/lib/portage/tests/glsa/test_security_set.py @@ -1,8 +1,6 @@ # Copyright 2013-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io import portage diff --git a/lib/portage/tests/resolver/test_profile_default_eapi.py b/lib/portage/tests/resolver/test_profile_default_eapi.py index cc5721949..130c231fd 100644 --- a/lib/portage/tests/resolver/test_profile_default_eapi.py +++ b/lib/portage/tests/resolver/test_profile_default_eapi.py @@ -1,8 +1,6 @@ # Copyright 2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io from portage import os, _encodings diff --git a/lib/portage/tests/resolver/test_profile_package_set.py b/lib/portage/tests/resolver/test_profile_package_set.py index 88a2a8259..a11609832 100644 --- a/lib/portage/tests/resolver/test_profile_package_set.py +++ b/lib/portage/tests/resolver/test_profile_package_set.py @@ -1,8 +1,6 @@ # Copyright 2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import io from portage import os, _encodings diff --git a/lib/portage/tests/unicode/test_string_format.py b/lib/portage/tests/unicode/test_string_format.py index 9d4366a91..e50c5c489 100644 --- a/lib/portage/tests/unicode/test_string_format.py +++ b/lib/portage/tests/unicode/test_string_format.py @@ -1,8 +1,6 @@ # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys from portage import _encodings, _unicode_encode diff --git a/lib/portage/update.py b/lib/portage/update.py index 1920d213a..754793d1c 100644 --- a/lib/portage/update.py +++ b/lib/portage/update.py @@ -1,8 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import errno import io import re diff --git a/lib/portage/util/__init__.py b/lib/portage/util/__init__.py index 154431a53..3349d2115 100644 --- a/lib/portage/util/__init__.py +++ b/lib/portage/util/__init__.py @@ -1,8 +1,6 @@ # Copyright 2004-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['apply_permissions', 'apply_recursive_permissions', 'apply_secpass_permissions', 'apply_stat_permissions', 'atomic_ofstream', 'cmp_sort_key', 'ConfigProtect', 'dump_traceback', 'ensure_dirs', diff --git a/lib/portage/util/_dyn_libs/NeededEntry.py b/lib/portage/util/_dyn_libs/NeededEntry.py index 70ff99100..59c4cf87d 100644 --- a/lib/portage/util/_dyn_libs/NeededEntry.py +++ b/lib/portage/util/_dyn_libs/NeededEntry.py @@ -1,8 +1,6 @@ # Copyright 2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import sys from portage import _encodings, _unicode_encode diff --git a/lib/portage/util/_dyn_libs/soname_deps.py b/lib/portage/util/_dyn_libs/soname_deps.py index 544cbc8f1..d81a9fac6 100644 --- a/lib/portage/util/_dyn_libs/soname_deps.py +++ b/lib/portage/util/_dyn_libs/soname_deps.py @@ -1,8 +1,6 @@ # Copyright 2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - import collections import fnmatch import functools diff --git a/lib/portage/util/digraph.py b/lib/portage/util/digraph.py index d279b7867..23c9e3c1a 100644 --- a/lib/portage/util/digraph.py +++ b/lib/portage/util/digraph.py @@ -1,8 +1,6 @@ # Copyright 2010-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = ['digraph'] import bisect diff --git a/lib/portage/util/futures/extendedfutures.py b/lib/portage/util/futures/extendedfutures.py index af384c745..158048a34 100644 --- a/lib/portage/util/futures/extendedfutures.py +++ b/lib/portage/util/futures/extendedfutures.py @@ -4,8 +4,6 @@ # This module provides an extended subset of the asyncio.futures.Futures # interface. -from __future__ import unicode_literals - __all__ = ( 'CancelledError', 'ExtendedFuture', diff --git a/lib/portage/util/futures/futures.py b/lib/portage/util/futures/futures.py index 9c9900d4c..dffb9e47f 100644 --- a/lib/portage/util/futures/futures.py +++ b/lib/portage/util/futures/futures.py @@ -5,8 +5,6 @@ # asyncio module (Python 3.3 and earlier), this module provides a # subset of the asyncio.futures.Futures interface. -from __future__ import unicode_literals - __all__ = ( 'CancelledError', 'Future', diff --git a/lib/portage/util/locale.py b/lib/portage/util/locale.py index 5b09945d6..f7e99a4fd 100644 --- a/lib/portage/util/locale.py +++ b/lib/portage/util/locale.py @@ -6,7 +6,7 @@ Function to check whether the current used LC_CTYPE handles case transformations of ASCII characters in a way compatible with the POSIX locale. """ -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import import locale import logging diff --git a/lib/portage/util/movefile.py b/lib/portage/util/movefile.py index 5477a669f..e6180e9f1 100644 --- a/lib/portage/util/movefile.py +++ b/lib/portage/util/movefile.py @@ -1,7 +1,7 @@ # Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import absolute_import, unicode_literals +from __future__ import absolute_import __all__ = ['movefile'] diff --git a/lib/portage/util/writeable_check.py b/lib/portage/util/writeable_check.py index e5b14c023..e3c946e8e 100644 --- a/lib/portage/util/writeable_check.py +++ b/lib/portage/util/writeable_check.py @@ -9,8 +9,6 @@ accepts a list of directories and returns a list of mounts which need to be remounted RW, then add "elif ostype == (the ostype value for your OS)" to get_ro_checker(). """ -from __future__ import unicode_literals - import io import logging import os diff --git a/lib/portage/versions.py b/lib/portage/versions.py index 100c8b84d..418f8d8ac 100644 --- a/lib/portage/versions.py +++ b/lib/portage/versions.py @@ -2,8 +2,6 @@ # Copyright 1998-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import unicode_literals - __all__ = [ 'best', 'catpkgsplit', 'catsplit', 'cpv_getkey', 'cpv_getversion', 'cpv_sort_key', 'pkgcmp', 'pkgsplit', diff --git a/lib/portage/xml/metadata.py b/lib/portage/xml/metadata.py index 64246c828..f45f1bfe8 100644 --- a/lib/portage/xml/metadata.py +++ b/lib/portage/xml/metadata.py @@ -28,8 +28,6 @@ 'Thomas Mills Hinkle' """ -from __future__ import unicode_literals - __all__ = ('MetaDataXML', 'parse_metadata_use') import sys diff --git a/repoman/lib/repoman/actions.py b/repoman/lib/repoman/actions.py index 387ba7800..64593503a 100644 --- a/repoman/lib/repoman/actions.py +++ b/repoman/lib/repoman/actions.py @@ -2,7 +2,7 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import errno import io diff --git a/repoman/lib/repoman/errors.py b/repoman/lib/repoman/errors.py index 9cf113ba0..3509ecc06 100644 --- a/repoman/lib/repoman/errors.py +++ b/repoman/lib/repoman/errors.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import sys diff --git a/repoman/lib/repoman/gpg.py b/repoman/lib/repoman/gpg.py index 7dac46f41..4e55a6e37 100644 --- a/repoman/lib/repoman/gpg.py +++ b/repoman/lib/repoman/gpg.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import errno import logging diff --git a/repoman/lib/repoman/main.py b/repoman/lib/repoman/main.py index 731e8eae2..b4fbe24e2 100755 --- a/repoman/lib/repoman/main.py +++ b/repoman/lib/repoman/main.py @@ -3,7 +3,7 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -from __future__ import print_function, unicode_literals +from __future__ import print_function import io import logging diff --git a/repoman/lib/repoman/metadata.py b/repoman/lib/repoman/metadata.py index 4537d2ce2..636da488c 100644 --- a/repoman/lib/repoman/metadata.py +++ b/repoman/lib/repoman/metadata.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import errno import logging diff --git a/repoman/lib/repoman/modules/commit/repochecks.py b/repoman/lib/repoman/modules/commit/repochecks.py index bedbdaf34..523d414d2 100644 --- a/repoman/lib/repoman/modules/commit/repochecks.py +++ b/repoman/lib/repoman/modules/commit/repochecks.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function from portage.output import red diff --git a/repoman/lib/repoman/modules/linechecks/config.py b/repoman/lib/repoman/modules/linechecks/config.py index 6e4c5314e..63a5bc44e 100644 --- a/repoman/lib/repoman/modules/linechecks/config.py +++ b/repoman/lib/repoman/modules/linechecks/config.py @@ -6,8 +6,6 @@ """This module contains functions used in Repoman to ascertain the quality and correctness of an ebuild.""" -from __future__ import unicode_literals - import collections import logging import os diff --git a/repoman/lib/repoman/modules/scan/ebuild/ebuild.py b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py index 70011e387..14d6178d7 100644 --- a/repoman/lib/repoman/modules/scan/ebuild/ebuild.py +++ b/repoman/lib/repoman/modules/scan/ebuild/ebuild.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import re import stat diff --git a/repoman/lib/repoman/modules/vcs/settings.py b/repoman/lib/repoman/modules/vcs/settings.py index a8e91dd27..ae4e0b3c4 100644 --- a/repoman/lib/repoman/modules/vcs/settings.py +++ b/repoman/lib/repoman/modules/vcs/settings.py @@ -2,7 +2,7 @@ Repoman VCSSettings modules ''' -from __future__ import print_function, unicode_literals +from __future__ import print_function import logging import sys diff --git a/repoman/lib/repoman/modules/vcs/vcs.py b/repoman/lib/repoman/modules/vcs/vcs.py index b4ff3dc9c..b19f486a8 100644 --- a/repoman/lib/repoman/modules/vcs/vcs.py +++ b/repoman/lib/repoman/modules/vcs/vcs.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import collections import logging diff --git a/repoman/lib/repoman/profile.py b/repoman/lib/repoman/profile.py index 50da91728..f6ca789c2 100644 --- a/repoman/lib/repoman/profile.py +++ b/repoman/lib/repoman/profile.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function from portage import normalize_path from portage import os diff --git a/repoman/lib/repoman/scanner.py b/repoman/lib/repoman/scanner.py index 5db54bb97..fdfe0ecca 100644 --- a/repoman/lib/repoman/scanner.py +++ b/repoman/lib/repoman/scanner.py @@ -1,6 +1,6 @@ # -*- coding:utf-8 -*- -from __future__ import print_function, unicode_literals +from __future__ import print_function import logging from itertools import chain diff --git a/repoman/lib/repoman/utilities.py b/repoman/lib/repoman/utilities.py index 790d5e516..98c74430f 100644 --- a/repoman/lib/repoman/utilities.py +++ b/repoman/lib/repoman/utilities.py @@ -6,7 +6,7 @@ """This module contains utility functions to help repoman find ebuilds to scan""" -from __future__ import print_function, unicode_literals +from __future__ import print_function __all__ = [ "editor_is_executable",
