summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--pyramid/util.py9
1 files changed, 2 insertions, 7 deletions
diff --git a/pyramid/util.py b/pyramid/util.py
index 02bd7ba2a..98732d17f 100644
--- a/pyramid/util.py
+++ b/pyramid/util.py
@@ -69,17 +69,12 @@ class InstancePropertyMixin(object):
can accept multiple ``(name, property)`` pairs generated via
:meth:`pyramid.util.InstancePropertyMixin._make_property`.
- ``attrs`` is a sequence of 2-tuples *or* a data structure with
- an ``.items()`` method which returns a sequence of 2-tuples
+ ``properties`` is a sequence of two-tuples *or* a data structure
+ with an ``.items()`` method which returns a sequence of two-tuples
(presumably a dictionary). It will be used to add several
properties to the instance in a manner that is more efficient
than simply calling ``set_property`` repeatedly.
"""
-
- if hasattr(properties, 'items'):
- attrs = properties.items()
- else:
- attrs = properties
attrs = dict(properties)
parent = self.__class__