aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-07-15 17:09:44 -0700
committerZac Medico <zmedico@gentoo.org>2020-07-15 17:09:55 -0700
commit788c0e8bb07b40d45bee243f563267444af791ac (patch)
tree02018b9bb9b144e4ed2ef77a3d0e13a2232adb90 /lib/_emerge
parentRemove unnecessary time.monotonic() compat (diff)
downloadportage-788c0e8bb07b40d45bee243f563267444af791ac.tar.gz
portage-788c0e8bb07b40d45bee243f563267444af791ac.tar.bz2
portage-788c0e8bb07b40d45bee243f563267444af791ac.zip
Remove from __future__ import unicode_literals
Signed-off-by: Zac Medico <zmedico@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/DependencyArg.py2
-rw-r--r--lib/_emerge/EbuildBuild.py2
-rw-r--r--lib/_emerge/EbuildPhase.py2
-rw-r--r--lib/_emerge/FakeVartree.py2
-rw-r--r--lib/_emerge/JobStatusDisplay.py2
-rw-r--r--lib/_emerge/Package.py2
-rw-r--r--lib/_emerge/Scheduler.py2
-rw-r--r--lib/_emerge/UseFlagDisplay.py2
-rw-r--r--lib/_emerge/UserQuery.py2
-rw-r--r--lib/_emerge/actions.py2
-rw-r--r--lib/_emerge/depgraph.py2
-rw-r--r--lib/_emerge/emergelog.py2
-rw-r--r--lib/_emerge/resolver/circular_dependency.py2
-rw-r--r--lib/_emerge/resolver/output.py2
-rw-r--r--lib/_emerge/resolver/output_helpers.py2
-rw-r--r--lib/_emerge/resolver/slot_collision.py2
-rw-r--r--lib/_emerge/search.py2
17 files changed, 6 insertions, 28 deletions
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