Javier Jardón pushed to branch jjardon/warnings_collections at BuildStream / buildstream
Commits:
-
f1aa0974
by Javier Jardón at 2018-10-18T14:13:35Z
12 changed files:
- buildstream/_artifactcache/artifactcache.py
- buildstream/_context.py
- buildstream/_includes.py
- buildstream/_loader/loadelement.py
- buildstream/_loader/loader.py
- buildstream/_options/optionpool.py
- buildstream/_project.py
- buildstream/element.py
- buildstream/plugins/elements/junction.py
- buildstream/plugins/sources/git.py
- buildstream/source.py
- tests/yaml/yaml.py
Changes:
... | ... | @@ -19,7 +19,8 @@ |
19 | 19 |
|
20 | 20 |
import os
|
21 | 21 |
import string
|
22 |
-from collections import Mapping, namedtuple
|
|
22 |
+from collections import namedtuple
|
|
23 |
+from collections.abc import Mapping
|
|
23 | 24 |
|
24 | 25 |
from ..types import _KeyStrength
|
25 | 26 |
from .._exceptions import ArtifactError, ImplError, LoadError, LoadErrorReason
|
... | ... | @@ -19,7 +19,8 @@ |
19 | 19 |
|
20 | 20 |
import os
|
21 | 21 |
import datetime
|
22 |
-from collections import deque, Mapping
|
|
22 |
+from collections import deque
|
|
23 |
+from collections.abc import Mapping
|
|
23 | 24 |
from contextlib import contextmanager
|
24 | 25 |
from . import utils
|
25 | 26 |
from . import _cachekey
|
1 | 1 |
import os
|
2 |
-from collections import Mapping
|
|
2 |
+from collections.abc import Mapping
|
|
3 | 3 |
from . import _yaml
|
4 | 4 |
from ._exceptions import LoadError, LoadErrorReason
|
5 | 5 |
|
... | ... | @@ -18,7 +18,7 @@ |
18 | 18 |
# Tristan Van Berkom <tristan vanberkom codethink co uk>
|
19 | 19 |
|
20 | 20 |
# System imports
|
21 |
-from collections import Mapping
|
|
21 |
+from collections.abc import Mapping
|
|
22 | 22 |
|
23 | 23 |
# BuildStream toplevel imports
|
24 | 24 |
from .._exceptions import LoadError, LoadErrorReason
|
... | ... | @@ -19,7 +19,8 @@ |
19 | 19 |
|
20 | 20 |
import os
|
21 | 21 |
from functools import cmp_to_key
|
22 |
-from collections import Mapping, namedtuple
|
|
22 |
+from collections import namedtuple
|
|
23 |
+from collections.abc import Mapping
|
|
23 | 24 |
import tempfile
|
24 | 25 |
import shutil
|
25 | 26 |
|
... | ... | @@ -18,7 +18,7 @@ |
18 | 18 |
# Tristan Van Berkom <tristan vanberkom codethink co uk>
|
19 | 19 |
#
|
20 | 20 |
|
21 |
-from collections import Mapping
|
|
21 |
+from collections.abc import Mapping
|
|
22 | 22 |
import jinja2
|
23 | 23 |
|
24 | 24 |
from .. import _yaml
|
... | ... | @@ -19,7 +19,8 @@ |
19 | 19 |
# Tiago Gomes <tiago gomes codethink co uk>
|
20 | 20 |
|
21 | 21 |
import os
|
22 |
-from collections import Mapping, OrderedDict
|
|
22 |
+from collections import OrderedDict
|
|
23 |
+from collections.abc import Mapping
|
|
23 | 24 |
from pluginbase import PluginBase
|
24 | 25 |
from . import utils
|
25 | 26 |
from . import _cachekey
|
... | ... | @@ -76,7 +76,8 @@ import os |
76 | 76 |
import re
|
77 | 77 |
import stat
|
78 | 78 |
import copy
|
79 |
-from collections import Mapping, OrderedDict
|
|
79 |
+from collections import OrderedDict
|
|
80 |
+from collections.abc import Mapping
|
|
80 | 81 |
from contextlib import contextmanager
|
81 | 82 |
import tempfile
|
82 | 83 |
import shutil
|
... | ... | @@ -124,7 +124,7 @@ the user to resolve possibly conflicting nested junctions by creating a junction |
124 | 124 |
with the same name in the top-level project, which then takes precedence.
|
125 | 125 |
"""
|
126 | 126 |
|
127 |
-from collections import Mapping
|
|
127 |
+from collections.abc import Mapping
|
|
128 | 128 |
from buildstream import Element
|
129 | 129 |
from buildstream._pipeline import PipelineError
|
130 | 130 |
|
... | ... | @@ -89,7 +89,7 @@ import os |
89 | 89 |
import errno
|
90 | 90 |
import re
|
91 | 91 |
import shutil
|
92 |
-from collections import Mapping
|
|
92 |
+from collections.abc import Mapping
|
|
93 | 93 |
from io import StringIO
|
94 | 94 |
|
95 | 95 |
from configparser import RawConfigParser
|
... | ... | @@ -155,7 +155,7 @@ Class Reference |
155 | 155 |
"""
|
156 | 156 |
|
157 | 157 |
import os
|
158 |
-from collections import Mapping
|
|
158 |
+from collections.abc import Mapping
|
|
159 | 159 |
from contextlib import contextmanager
|
160 | 160 |
|
161 | 161 |
from . import Plugin, Consistency
|
1 | 1 |
import os
|
2 | 2 |
import pytest
|
3 | 3 |
import tempfile
|
4 |
-from collections import Mapping
|
|
4 |
+from collections.abc import Mapping
|
|
5 | 5 |
|
6 | 6 |
from buildstream import _yaml
|
7 | 7 |
from buildstream._exceptions import LoadError, LoadErrorReason
|