wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix collections.deque import in compat module

Browse source
This commit is contained in:
Sviatoslav Sydorenko 2018-09-17 12:28:41 +02:00 committed by Sviatoslav Sydorenko
parent 846ee7e85f
commit a978d7f283
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/module_utils/basic.py
View file

@ -82,6 +82,7 @@ import pwd
import platform import platform
import errno import errno
import datetime import datetime
from collections import deque
from itertools import chain, repeat from itertools import chain, repeat
try: try:
@ -148,7 +149,6 @@ except Exception:
pass pass
from ansible.module_utils.common._collections_compat import ( from ansible.module_utils.common._collections_compat import (
deque,
KeysView, KeysView,
Mapping, MutableMapping, Mapping, MutableMapping,
Sequence, MutableSequence, Sequence, MutableSequence,

4
lib/ansible/module_utils/common/_collections_compat.py
View file

@ -14,7 +14,7 @@ __metaclass__ = type
try: try:
"""Python 3.3+ branch.""" """Python 3.3+ branch."""
from collections.abc import ( from collections.abc import (
deque, KeysView, KeysView,
Mapping, MutableMapping, Mapping, MutableMapping,
Sequence, MutableSequence, Sequence, MutableSequence,
Set, MutableSet, Set, MutableSet,
@ -22,7 +22,7 @@ try:
except ImportError: except ImportError:
"""Use old lib location under 2.6-3.2.""" """Use old lib location under 2.6-3.2."""
from collections import ( from collections import (
deque, KeysView, KeysView,
Mapping, MutableMapping, Mapping, MutableMapping,
Sequence, MutableSequence, Sequence, MutableSequence,
Set, MutableSet, Set, MutableSet,