[Notes] [Git][BuildStream/buildstream][master] 2 commits: Fix python war

Valentin David pushed to branch master at BuildStream / buildstream

Commits:

f1aa0974

by Javier Jardón at 2018-10-18T14:13:35Z

Fix python warnings: Use collections.abc instead collections

Since python 3.3, collections has been moved to collections.abc module.
For backwards compatibility, they continue to be visible in this module through Python 3.7.
Subsequently, they will be removed entirely.

See https://docs.python.org/3/library/collections.html

f1550c8e

by Valentin David at 2018-10-18T16:02:45Z

Merge branch 'jjardon/warnings_collections' into 'master'

Fix python warnings: Use collections.abc instead collections

See merge request BuildStream/buildstream!883

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:

buildstream/_artifactcache/artifactcache.py

@@ -19,7 +19,8 @@
  import os
  import string
 -from collections import Mapping, namedtuple
 +from collections import namedtuple
 +from collections.abc import Mapping
  from ..types import _KeyStrength
  from .._exceptions import ArtifactError, ImplError, LoadError, LoadErrorReason

buildstream/_context.py

@@ -19,7 +19,8 @@
  import os
  import datetime
 -from collections import deque, Mapping
 +from collections import deque
 +from collections.abc import Mapping
  from contextlib import contextmanager
  from . import utils
  from . import _cachekey

buildstream/_includes.py

  import os
 -from collections import Mapping
 +from collections.abc import Mapping
  from . import _yaml
  from ._exceptions import LoadError, LoadErrorReason

buildstream/_loader/loadelement.py

@@ -18,7 +18,7 @@
  #        Tristan Van Berkom <tristan vanberkom codethink co uk>
  # System imports
 -from collections import Mapping
 +from collections.abc import Mapping
  # BuildStream toplevel imports
  from .._exceptions import LoadError, LoadErrorReason

buildstream/_loader/loader.py

@@ -19,7 +19,8 @@
  import os
  from functools import cmp_to_key
 -from collections import Mapping, namedtuple
 +from collections import namedtuple
 +from collections.abc import Mapping
  import tempfile
  import shutil

buildstream/_options/optionpool.py

@@ -18,7 +18,7 @@
  #        Tristan Van Berkom <tristan vanberkom codethink co uk>
+ #
 -from collections import Mapping
 +from collections.abc import Mapping
  import jinja2
  from .. import _yaml

buildstream/_project.py

@@ -19,7 +19,8 @@
  #        Tiago Gomes <tiago gomes codethink co uk>
  import os
 -from collections import Mapping, OrderedDict
 +from collections import OrderedDict
 +from collections.abc import Mapping
  from pluginbase import PluginBase
  from . import utils
  from . import _cachekey

buildstream/element.py

@@ -76,7 +76,8 @@ import os
  import re
  import stat
  import copy
 -from collections import Mapping, OrderedDict
 +from collections import OrderedDict
 +from collections.abc import Mapping
  from contextlib import contextmanager
  import tempfile
  import shutil

buildstream/plugins/elements/junction.py

@@ -124,7 +124,7 @@ the user to resolve possibly conflicting nested junctions by creating a junction
  with the same name in the top-level project, which then takes precedence.
  """
 -from collections import Mapping
 +from collections.abc import Mapping
  from buildstream import Element
  from buildstream._pipeline import PipelineError

buildstream/plugins/sources/git.py

@@ -89,7 +89,7 @@ import os
  import errno
  import re
  import shutil
 -from collections import Mapping
 +from collections.abc import Mapping
  from io import StringIO
  from configparser import RawConfigParser

buildstream/source.py

@@ -155,7 +155,7 @@ Class Reference
  """
  import os
 -from collections import Mapping
 +from collections.abc import Mapping
  from contextlib import contextmanager
  from . import Plugin, Consistency

tests/yaml/yaml.py

  import os
  import pytest
  import tempfile
 -from collections import Mapping
 +from collections.abc import Mapping
  from buildstream import _yaml
  from buildstream._exceptions import LoadError, LoadErrorReason

[Notes] [Git][BuildStream/buildstream][master] 2 commits: Fix python warnings: Use collections.abc instead collections

Valentin David pushed to branch master at BuildStream / buildstream

Commits:

12 changed files:

Changes: