[Notes] [Git][BuildStream/buildstream][chandan/fix-mapping-import] 3 commits: doc/badges.py: Fix catching of CalledProcessError

[Jürg Billeter <gitlab mg gitlab com>]

Title: GitLab

Jürg Billeter pushed to branch chandan/fix-mapping-import at BuildStream / buildstream

Commits:

• 00b86b19
  by Chandan Singh at 2019-02-18T18:59:31Z

  doc/badges.py: Fix catching of CalledProcessError
  
  Since `CalledProcessError` is defined by the `subprocess` module, it
  must be caught as `subprocess.CalledProcessError`, and not as simply
  `CalledProcessError`.
  

• 067a0c6b
  by Chandan Singh at 2019-02-18T20:31:10Z

  Merge branch 'chandan/fix-badge-subprocess-error' into 'master'
  
  doc/badges.py: Fix catching of CalledProcessError
  
  See merge request BuildStream/buildstream!1160

• fca37d0d
  by Chandan Singh at 2019-02-19T06:37:04Z

  buildstream/_yaml.py: Import Mapping from collections.abc
  
  Instead of importing `Mapping` from `collections`, it must be imported
  from `collections.abc`, as the old method will stop working from Python
  3.8.
  

2 changed files:

• buildstream/_yaml.py
• doc/badges.py

Changes:

buildstream/_yaml.py

---

...	...	@@ -940,7 +940,7 @@ def node_sanitize(node):
940	940	return [node_sanitize(elt) for elt in node]
941	941
942	942	# Finally ChainMap and dict, and other Mappings need special handling
943		- if node_type in (dict, ChainMap) or isinstance(node, collections.Mapping):
	943	+ if node_type in (dict, ChainMap) or isinstance(node, collections.abc.Mapping):
944	944	result = SanitizedDict()
945	945
946	946	key_list = [key for key, _ in node_items(node)]

doc/badges.py

---

...	...	@@ -96,7 +96,7 @@ def parse_tag(tag):
96	96	def guess_version(release):
97	97	try:
98	98	tags_output = subprocess.check_output(['git', 'tag'])
99		- except CalledProcessError:
	99	+ except subprocess.CalledProcessError:
100	100	return (0, 0, 0)
101	101
102	102	# Parse the `git tag` output into a list of integer tuples

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.