commit: 603ee739bd22b9df9a1ee79d5644f7ad9320733a
Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 19:48:43 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 19:52:00 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=603ee739
Import OrderedDict directly from collections
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/_emerge/depgraph.py | 6 +++---
lib/portage/dbapi/porttree.py | 5 +++--
lib/portage/news.py | 5 +++--
lib/portage/package/ebuild/fetch.py | 6 ++++--
lib/portage/sync/__init__.py | 5 +++--
lib/portage/sync/controller.py | 5 +++--
6 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/lib/_emerge/depgraph.py b/lib/_emerge/depgraph.py
index 63e905cdb..32b2d7da3 100644
--- a/lib/_emerge/depgraph.py
+++ b/lib/_emerge/depgraph.py
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from __future__ import division, print_function, unicode_literals
@@ -12,11 +12,11 @@ import stat
import sys
import textwrap
import warnings
-from collections import deque
+from collections import deque, OrderedDict
from itertools import chain
import portage
-from portage import os, OrderedDict
+from portage import os
from portage import _unicode_decode, _unicode_encode, _encodings
from portage.const import PORTAGE_PACKAGE_ATOM, USER_CONFIG_PATH, VCS_DIRS
from portage.dbapi import dbapi
diff --git a/lib/portage/dbapi/porttree.py b/lib/portage/dbapi/porttree.py
index 64a5f3681..7a28f5876 100644
--- a/lib/portage/dbapi/porttree.py
+++ b/lib/portage/dbapi/porttree.py
@@ -1,4 +1,4 @@
-# Copyright 1998-2018 Gentoo Foundation
+# Copyright 1998-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from __future__ import unicode_literals
@@ -34,7 +34,6 @@ from portage import eclass_cache, \
from portage import os
from portage import _encodings
from portage import _unicode_encode
-from portage import OrderedDict
from portage.util._eventloop.EventLoop import EventLoop
from portage.util.futures import asyncio
from portage.util.futures.compat_coroutine import coroutine, coroutine_return
@@ -49,6 +48,8 @@ import errno
import collections
import functools
+from collections import OrderedDict
+
try:
from urllib.parse import urlparse
except ImportError:
diff --git a/lib/portage/news.py b/lib/portage/news.py
index 8397646b0..f7c8c7bb9 100644
--- a/lib/portage/news.py
+++ b/lib/portage/news.py
@@ -1,5 +1,5 @@
# portage: news management code
-# Copyright 2006-2017 Gentoo Foundation
+# Copyright 2006-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function, unicode_literals
@@ -9,13 +9,14 @@ __all__ = ["NewsManager", "NewsItem", "DisplayRestriction",
"DisplayInstalledRestriction",
"count_unread_news", "display_news_notifications"]
+from collections import OrderedDict
+
import fnmatch
import io
import logging
import os as _os
import re
import portage
-from portage import OrderedDict
from portage import os
from portage import _encodings
from portage import _unicode_decode
diff --git a/lib/portage/package/ebuild/fetch.py
b/lib/portage/package/ebuild/fetch.py
index 0431e11ea..bfd97601c 100644
--- a/lib/portage/package/ebuild/fetch.py
+++ b/lib/portage/package/ebuild/fetch.py
@@ -1,4 +1,4 @@
-# Copyright 2010-2017 Gentoo Foundation
+# Copyright 2010-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -14,6 +14,8 @@ import stat
import sys
import tempfile
+from collections import OrderedDict
+
try:
from urllib.parse import urlparse
except ImportError:
@@ -27,7 +29,7 @@ portage.proxy.lazyimport.lazyimport(globals(),
'portage.package.ebuild.prepare_build_dirs:prepare_build_dirs',
)
-from portage import OrderedDict, os, selinux, shutil, _encodings, \
+from portage import os, selinux, shutil, _encodings, \
_shell_quote, _unicode_encode
from portage.checksum import (get_valid_checksum_keys, perform_md5, verify_all,
_filter_unaccelarated_hashes, _hash_filter, _apply_hash_filter)
diff --git a/lib/portage/sync/__init__.py b/lib/portage/sync/__init__.py
index 805b1f270..63727545f 100644
--- a/lib/portage/sync/__init__.py
+++ b/lib/portage/sync/__init__.py
@@ -1,9 +1,10 @@
-# Copyright 2014-2015 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
import os
-from portage import OrderedDict
+from collections import OrderedDict
+
from portage.module import Modules
from portage.sync.controller import SyncManager
from portage.sync.config_checks import check_type
diff --git a/lib/portage/sync/controller.py b/lib/portage/sync/controller.py
index bf5750f7f..c4c72e73a 100644
--- a/lib/portage/sync/controller.py
+++ b/lib/portage/sync/controller.py
@@ -1,4 +1,4 @@
-# Copyright 2014-2017 Gentoo Foundation
+# Copyright 2014-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
from __future__ import print_function
@@ -10,6 +10,8 @@ import grp
import pwd
import warnings
+from collections import OrderedDict
+
import portage
from portage import os
from portage.progress import ProgressBar
@@ -22,7 +24,6 @@ warn = create_color_func("WARN")
from portage.package.ebuild.doebuild import _check_temp_dir
from portage.metadata import action_metadata
from portage.util._async.AsyncFunction import AsyncFunction
-from portage import OrderedDict
from portage import _unicode_decode
from portage import util
from _emerge.CompositeTask import CompositeTask
