aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2020-07-17 15:37:07 +0200
committerMichał Górny <mgorny@gentoo.org>2020-07-18 04:33:08 +0200
commit39044784ba1f5ce38dd1ba8310a35689fbd30291 (patch)
treeaf9bf9828ecee724244d65db53bfb37c5e09c2c1 /lib/_emerge
parentCorrect inverted py3 json indentation (diff)
downloadportage-39044784ba1f5ce38dd1ba8310a35689fbd30291.tar.gz
portage-39044784ba1f5ce38dd1ba8310a35689fbd30291.tar.bz2
portage-39044784ba1f5ce38dd1ba8310a35689fbd30291.zip
Remove py<3.4 import compatibility
Closes: https://github.com/gentoo/portage/pull/577 Reviewed-by: Zac Medico <zmedico@gentoo.org> Signed-off-by: Michał Górny <mgorny@gentoo.org>
Diffstat (limited to 'lib/_emerge')
-rw-r--r--lib/_emerge/BinpkgFetcher.py5
-rw-r--r--lib/_emerge/BlockerCache.py6
2 files changed, 2 insertions, 9 deletions
diff --git a/lib/_emerge/BinpkgFetcher.py b/lib/_emerge/BinpkgFetcher.py
index c26c9bd6b..01c9bc1e6 100644
--- a/lib/_emerge/BinpkgFetcher.py
+++ b/lib/_emerge/BinpkgFetcher.py
@@ -6,10 +6,7 @@ import functools
from _emerge.AsynchronousLock import AsynchronousLock
from _emerge.CompositeTask import CompositeTask
from _emerge.SpawnProcess import SpawnProcess
-try:
- from urllib.parse import urlparse as urllib_parse_urlparse
-except ImportError:
- from urlparse import urlparse as urllib_parse_urlparse
+from urllib.parse import urlparse as urllib_parse_urlparse
import stat
import sys
import portage
diff --git a/lib/_emerge/BlockerCache.py b/lib/_emerge/BlockerCache.py
index d0beb46ac..5f8fb360e 100644
--- a/lib/_emerge/BlockerCache.py
+++ b/lib/_emerge/BlockerCache.py
@@ -7,11 +7,7 @@ from portage.util import writemsg
from portage.data import secpass
import portage
from portage import os
-
-try:
- import cPickle as pickle
-except ImportError:
- import pickle
+import pickle
class BlockerCache(portage.cache.mappings.MutableMapping):
"""This caches blockers of installed packages so that dep_check does not