prov 3.2.1__tar.gz → 3.2.2__tar.gz

{prov-3.2.1/src/prov.egg-info → prov-3.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prov
-Version: 3.2.1
+Version: 3.2.2
 Summary: A library for W3C Provenance Data Model supporting PROV-N, PROV-JSON, PROV-XML, PROV-O (RDF) and PROV-JSONLD
 Author-email: Trung Dong Huynh <trungdong@donggiang.com>
 License-Expression: MIT
@@ -9,6 +9,7 @@ Project-URL: Documentation, https://prov.readthedocs.io
 Project-URL: Repository, https://github.com/trungdong/prov
 Project-URL: Issues, https://github.com/trungdong/prov/issues
 Project-URL: Changelog, https://prov.readthedocs.io/en/latest/history.html
+Project-URL: Discussions, https://github.com/trungdong/prov/discussions
 Keywords: provenance,graph,model,PROV,PROV-DM,PROV-JSON,W3C,PROV-XML,PROV-N,PROV-O,RDF,PROV-JSONLD,JSON-LD
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
@@ -83,9 +84,11 @@ Over 7,000 public repositories on GitHub
 3.0.0 completed the modernisation programme (tooling, type hints, tests, documentation and
 standards conformance) and 3.1.0 added PROV-JSONLD.
 [What's new in 3](https://prov.readthedocs.io/en/latest/whats-new-3.html) summarises the 3.x
-line for projects still on 2.x.
+line for projects still on 2.x, and the announcement post
+[PROV Python 3.x: a major release](https://trungdong.github.io/provpy-3.html) covers what
+changed and who uses the package.
 [ROADMAP.md](https://github.com/trungdong/prov/blob/main/ROADMAP.md) lists the planned
-releases and the API-stability promise. Feedback is welcome on the
+releases and the support policy. Feedback is welcome on the
 [issue tracker](https://github.com/trungdong/prov/issues).
 
 ## Supported versions

{prov-3.2.1 → prov-3.2.2}/README.md

@@ -36,9 +36,11 @@ Over 7,000 public repositories on GitHub
 3.0.0 completed the modernisation programme (tooling, type hints, tests, documentation and
 standards conformance) and 3.1.0 added PROV-JSONLD.
 [What's new in 3](https://prov.readthedocs.io/en/latest/whats-new-3.html) summarises the 3.x
-line for projects still on 2.x.
+line for projects still on 2.x, and the announcement post
+[PROV Python 3.x: a major release](https://trungdong.github.io/provpy-3.html) covers what
+changed and who uses the package.
 [ROADMAP.md](https://github.com/trungdong/prov/blob/main/ROADMAP.md) lists the planned
-releases and the API-stability promise. Feedback is welcome on the
+releases and the support policy. Feedback is welcome on the
 [issue tracker](https://github.com/trungdong/prov/issues).
 
 ## Supported versions

{prov-3.2.1 → prov-3.2.2}/pyproject.toml

@@ -66,6 +66,7 @@ Documentation = "https://prov.readthedocs.io"
 Repository = "https://github.com/trungdong/prov"
 Issues = "https://github.com/trungdong/prov/issues"
 Changelog = "https://prov.readthedocs.io/en/latest/history.html"
+Discussions = "https://github.com/trungdong/prov/discussions"
 
 [build-system]
 requires = ["setuptools>=40.8.0", "wheel"]  # PEP 508 specifications.
@@ -196,4 +197,51 @@ exclude_lines = [
 [tool.mypy]
 python_version = "3.10"
 strict = true
-exclude = ["^src/prov/tests/"]
+
+# Test modules that do not yet pass strict mypy. The list only shrinks. A PR
+# that makes a module pass deletes its name, and a new test module never joins.
+[[tool.mypy.overrides]]
+module = [
+    "prov.tests.conftest",
+    "prov.tests.examples",
+    "prov.tests.strategies",
+    "prov.tests.test_attribute_merging",
+    "prov.tests.test_attributes",
+    "prov.tests.test_chaining",
+    "prov.tests.test_cli_smoke",
+    "prov.tests.test_conformance_dm",
+    "prov.tests.test_datetime_parsing",
+    "prov.tests.test_dot",
+    "prov.tests.test_examples",
+    "prov.tests.test_extras",
+    "prov.tests.test_graphs",
+    "prov.tests.test_identifier",
+    "prov.tests.test_identifier_slots",
+    "prov.tests.test_json",
+    "prov.tests.test_json_schema",
+    "prov.tests.test_jsonld",
+    "prov.tests.test_jsonld_schema",
+    "prov.tests.test_jsonld_semantics",
+    "prov.tests.test_literal_semantics",
+    "prov.tests.test_malformed",
+    "prov.tests.test_model",
+    "prov.tests.test_namespace_cache",
+    "prov.tests.test_numeric_typing",
+    "prov.tests.test_property_roundtrip",
+    "prov.tests.test_provn",
+    "prov.tests.test_provn_corpus",
+    "prov.tests.test_provn_escaping",
+    "prov.tests.test_provn_lexer",
+    "prov.tests.test_provn_profiles",
+    "prov.tests.test_public_api",
+    "prov.tests.test_qnames",
+    "prov.tests.test_rdf",
+    "prov.tests.test_read",
+    "prov.tests.test_scripts",
+    "prov.tests.test_statements",
+    "prov.tests.test_unification_constraints",
+    "prov.tests.test_unification_rules",
+    "prov.tests.test_xml",
+    "prov.tests.test_xml_schema",
+]
+ignore_errors = true

{prov-3.2.1 → prov-3.2.2}/src/prov/__init__.py

@@ -11,7 +11,7 @@ if TYPE_CHECKING:
 
 __author__ = "Trung Dong Huynh"
 __email__ = "trungdong@donggiang.com"
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 
 __all__ = ["Error", "model", "read"]
 

{prov-3.2.1 → prov-3.2.2}/src/prov/model/__init__.py

@@ -45,6 +45,7 @@ from prov.model.records import (
     ActivityRef as ActivityRef,
     AgentRef as AgentRef,
     AttributePair as AttributePair,
+    AttributeValue as AttributeValue,
     DatetimeOrStr as DatetimeOrStr,
     EntityRef as EntityRef,
     GenerationRef as GenerationRef,

{prov-3.2.1 → prov-3.2.2}/src/prov/model/bundle.py

@@ -108,6 +108,7 @@ from prov.model.records import (
     RecordAttributesArg,
     StreamOrPath,
     UsageRef,
+    _attribute_pairs,
     _ensure_datetime,
 )
 
@@ -777,8 +778,8 @@ class ProvBundle:
                 :data:`PROV_REC_CLS`.
             identifier: The identifier for the new record (may be ``None`` for
                 relations).
-            attributes: Formal attributes of the record, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            attributes: Formal attributes of the record, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
             other_attributes: Additional (non-formal) attributes, in the same
                 forms (default: ``None``).
 
@@ -787,19 +788,9 @@ class ProvBundle:
         """
         attr_list: list[AttributePair] = []
         if attributes:
-            if isinstance(attributes, dict):
-                attr_list.extend(
-                    cast("dict[QualifiedNameCandidate, Any]", attributes).items()
-                )
-            else:
-                # expecting a list of attributes here
-                attr_list.extend(attributes)
+            attr_list.extend(_attribute_pairs(attributes))
         if other_attributes:
-            attr_list.extend(
-                cast("dict[QualifiedNameCandidate, Any]", other_attributes).items()
-                if isinstance(other_attributes, dict)
-                else other_attributes
-            )
+            attr_list.extend(_attribute_pairs(other_attributes))
         record_identifier = (
             self.valid_qualified_name(identifier) if identifier else None
         )
@@ -837,7 +828,7 @@ class ProvBundle:
         Args:
             identifier: The identifier for the new entity.
             other_attributes: Optional attributes for the entity, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvEntity`.
@@ -860,7 +851,7 @@ class ProvBundle:
                 (default: ``None``).
             endTime: Optional end time, in the same forms (default: ``None``).
             other_attributes: Optional attributes for the activity, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvActivity`.
@@ -895,8 +886,8 @@ class ProvBundle:
                 :func:`~prov.model.parse_xsd_datetime` (default: ``None``).
             identifier: Optional identifier for the generation record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new generation record.
@@ -933,8 +924,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the usage record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvUsage` record.
@@ -974,8 +965,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the start record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvStart` record.
@@ -1015,8 +1006,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the end record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvEnd` record.
@@ -1053,8 +1044,8 @@ class ProvBundle:
                 :func:`~prov.model.parse_xsd_datetime` (default: ``None``).
             identifier: Optional identifier for the invalidation record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvInvalidation` record.
@@ -1085,8 +1076,8 @@ class ProvBundle:
             informant: The informing activity (relationship source).
             identifier: Optional identifier for the communication record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvCommunication` record.
@@ -1111,8 +1102,8 @@ class ProvBundle:
 
         Args:
             identifier: The identifier for the new agent.
-            other_attributes: Optional attributes for the agent, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional attributes for the agent, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvAgent`.
@@ -1135,8 +1126,8 @@ class ProvBundle:
                 to (relationship destination).
             identifier: Optional identifier for the attribution record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvAttribution` record.
@@ -1170,8 +1161,8 @@ class ProvBundle:
                 plan (default: ``None``).
             identifier: Optional identifier for the association record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvAssociation` record.
@@ -1207,8 +1198,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the delegation record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvDelegation` record.
@@ -1241,8 +1232,8 @@ class ProvBundle:
                 destination).
             identifier: Optional identifier for the influence record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvInfluence` record.
@@ -1284,8 +1275,8 @@ class ProvBundle:
                 activity's use of the used entity (default: ``None``).
             identifier: Optional identifier for the derivation record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvDerivation` record.
@@ -1328,8 +1319,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the revision record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvDerivation` record, typed as a revision.
@@ -1373,8 +1364,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the quotation record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvDerivation` record, typed as a quotation.
@@ -1420,8 +1411,8 @@ class ProvBundle:
                 (default: ``None``).
             identifier: Optional identifier for the primary-source record
                 (default: ``None``).
-            other_attributes: Optional extra attributes, as a dict or an
-                iterable of ``(name, value)`` pairs (default: ``None``).
+            other_attributes: Optional extra attributes, as a dict or a
+                list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvDerivation` record, typed as a primary source.
@@ -1523,7 +1514,7 @@ class ProvBundle:
         Args:
             identifier: The identifier for the new collection.
             other_attributes: Optional attributes for the collection, as a dict
-                or an iterable of ``(name, value)`` pairs (default: ``None``).
+                or a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             The new :class:`ProvEntity`, typed as a collection.

{prov-3.2.1 → prov-3.2.2}/src/prov/model/records.py

@@ -10,8 +10,15 @@ import os
 import re
 import typing
 from collections import defaultdict
-from collections.abc import Callable, Iterable, Iterator, MutableSet
-from typing import IO, TYPE_CHECKING, Any, Final, Union, cast
+from collections.abc import (
+    Callable,
+    Iterable,
+    Iterator,
+    MutableSet,
+    Sequence,
+    Set as AbstractSet,
+)
+from typing import IO, TYPE_CHECKING, Any, Final, Protocol, TypeVar, Union, cast
 
 from prov import Error
 from prov.constants import (
@@ -99,9 +106,6 @@ GenerationRef: typing.TypeAlias = Union["ProvGeneration", QualifiedNameCandidate
 UsageRef: typing.TypeAlias = Union["ProvUsage", QualifiedNameCandidate]
 NameValuePair: typing.TypeAlias = tuple[QualifiedName, Any]
 AttributePair: typing.TypeAlias = tuple[QualifiedNameCandidate, Any]
-RecordAttributesArg: typing.TypeAlias = (
-    dict[QualifiedNameCandidate, Any] | Iterable[AttributePair]
-)
 DatetimeOrStr: typing.TypeAlias = datetime.datetime | str
 NSCollection: typing.TypeAlias = dict[str, str] | Iterable[Namespace]
 PathLike: typing.TypeAlias = str | bytes | os.PathLike[str]
@@ -566,6 +570,45 @@ CoercedAttributeValue: typing.TypeAlias = (
     QualifiedName | datetime.datetime | Literal | SupportedXSDParsedTypes
 )
 
+_K_co = TypeVar("_K_co", covariant=True)
+_V_co = TypeVar("_V_co", covariant=True)
+
+
+class _SupportsItems(Protocol[_K_co, _V_co]):
+    # `Mapping` is invariant in its key type, so `dict[QualifiedName, str]` is
+    # no `Mapping[QualifiedNameCandidate, ...]`. This protocol is covariant in
+    # both parameters.
+
+    def items(self) -> AbstractSet[tuple[_K_co, _V_co]]: ...
+
+
+AttributeValue: typing.TypeAlias = Union[
+    "ProvRecord", QualifiedName, datetime.datetime, Literal, SupportedXSDParsedTypes
+]
+"""A value accepted for a record attribute, before coercion."""
+
+# `Iterable` is absent on purpose. A dict is itself an iterable, so an `Iterable`
+# member makes a dict literal's target ambiguous to mypy and breaks its
+# inference (#474). Pair values are `Any` because mypy joins the mixed values
+# of a prebuilt list to `object`, which no precise type accepts.
+RecordAttributesArg: typing.TypeAlias = (
+    _SupportsItems[QualifiedNameCandidate, AttributeValue]
+    | Sequence[AttributePair]
+    | AbstractSet[AttributePair]
+    | Iterator[AttributePair]
+)
+
+
+def _attribute_pairs(attributes: RecordAttributesArg) -> Iterable[AttributePair]:
+    # `dict` is tested first because it is the common case on the
+    # record-construction hot path.
+    if isinstance(attributes, dict):
+        return attributes.items()
+    items = getattr(attributes, "items", None)
+    if callable(items):
+        return cast("Iterable[AttributePair]", items())
+    return cast("Iterable[AttributePair]", attributes)
+
 
 # Exceptions and warnings
 class ProvException(Error):
@@ -627,7 +670,7 @@ class ProvRecord:
             bundle: The bundle owning this PROV record.
             identifier: The (unique) identifier of the record.
             attributes: Attributes to associate with the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
         """
         self._bundle = bundle
         self._identifier = identifier
@@ -938,9 +981,10 @@ class ProvRecord:
         are skipped.
 
         Args:
-            attributes: The attributes to add, either as a dict keyed by
-                qualified-name identifiers or an iterable of ``(name, value)``
-                pairs whose names satisfy the same condition.
+            attributes: The attributes to add, as a mapping keyed by
+                qualified-name identifiers, or as a sequence, set or iterator
+                of ``(name, value)`` pairs whose names satisfy the same
+                condition.
 
         Raises:
             ProvExceptionInvalidQualifiedName: If an attribute name cannot be
@@ -950,21 +994,17 @@ class ProvRecord:
                 (non-collection) attribute.
         """
         if attributes:
-            if isinstance(attributes, dict):
-                # Converting the dictionary into a list of tuples
-                # (i.e. attribute-value pairs)
-                attributes = cast(
-                    "dict[QualifiedNameCandidate, Any]", attributes
-                ).items()
+            # Two passes follow, so a one-shot iterator is copied first.
+            pairs = list(_attribute_pairs(attributes))
 
             # Check if one of the attributes specifies that the current type
             # is a collection. In that case multiple attributes of the same
             # type are allowed.
             is_collection = any(
-                attr_name == PROV_ATTR_COLLECTION for attr_name, _ in attributes
+                attr_name == PROV_ATTR_COLLECTION for attr_name, _ in pairs
             )
 
-            for attr_name, original_value in attributes:
+            for attr_name, original_value in pairs:
                 if original_value is None:
                     continue
 
@@ -1118,7 +1158,7 @@ class ProvEntity(ProvElement):
                 :class:`datetime.datetime` or an ``xsd:dateTime`` string accepted by
                 :func:`~prov.model.parse_xsd_datetime` (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1141,7 +1181,7 @@ class ProvEntity(ProvElement):
                 :class:`datetime.datetime` or an ``xsd:dateTime`` string accepted by
                 :func:`~prov.model.parse_xsd_datetime` (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1168,7 +1208,7 @@ class ProvEntity(ProvElement):
             usage: Optional usage record qualifying the derivation through an
                 internal usage (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1187,7 +1227,7 @@ class ProvEntity(ProvElement):
             agent: The agent (or its string identifier) involved in the
                 attribution.
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1251,7 +1291,7 @@ class ProvEntity(ProvElement):
             usage: Optional usage record qualifying the derivation
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1280,7 +1320,7 @@ class ProvEntity(ProvElement):
             usage: Optional usage record qualifying the derivation
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1309,7 +1349,7 @@ class ProvEntity(ProvElement):
             usage: Optional usage record qualifying the derivation
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1345,7 +1385,7 @@ class ProvEntity(ProvElement):
             influencer: The influencing entity, activity or agent (or its
                 string identifier).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This entity (to allow chaining).
@@ -1411,7 +1451,7 @@ class ProvActivity(ProvElement):
                 :func:`~prov.model.parse_xsd_datetime`
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1427,7 +1467,7 @@ class ProvActivity(ProvElement):
         Args:
             informant: The informing activity (relationship source).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1456,7 +1496,7 @@ class ProvActivity(ProvElement):
                 :func:`~prov.model.parse_xsd_datetime`
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1483,7 +1523,7 @@ class ProvActivity(ProvElement):
                 :func:`~prov.model.parse_xsd_datetime`
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1505,7 +1545,7 @@ class ProvActivity(ProvElement):
             plan: Optional entity qualifying the association through an
                 internal plan (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1524,7 +1564,7 @@ class ProvActivity(ProvElement):
             influencer: The influencing entity, activity or agent (or its
                 string identifier).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This activity (to allow chaining).
@@ -1628,7 +1668,7 @@ class ProvAgent(ProvElement):
             activity: Optional activity qualifying the delegation
                 (default: ``None``).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This agent (to allow chaining).
@@ -1649,7 +1689,7 @@ class ProvAgent(ProvElement):
             influencer: The influencing entity, activity or agent (or its
                 string identifier).
             attributes: Optional extra attributes for the record, as a dict or
-                an iterable of ``(name, value)`` pairs (default: ``None``).
+                a list of ``(name, value)`` pairs (default: ``None``).
 
         Returns:
             This agent (to allow chaining).