Skip to content

Commit c6c0c52

Browse files
committed
Minor documentation tweaks
1 parent 397c453 commit c6c0c52

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/icat/query.py

+5-6
Original file line numberDiff line numberDiff line change
@@ -410,9 +410,7 @@ def setOrder(self, order):
410410
the latter being either "ASC" or "DESC" for ascending or
411411
descending order respectively.
412412
:type order: iterable or :class:`bool`
413-
:raise ValueError: if any attribute in `order` is not valid or
414-
if any attribute appears more than once in the resulting
415-
ORDER BY clause.
413+
:raise ValueError: if any attribute in `order` is not valid.
416414
417415
.. versionchanged:: 0.19.0
418416
allow one to many relationships in `order`. Emit a
@@ -466,14 +464,15 @@ def addConditions(self, conditions):
466464
"""Add conditions to the constraints to build the WHERE clause from.
467465
468466
:param conditions: the conditions to restrict the search
469-
result. This must be a list of tuples with a pair of an
470-
attribute name and a condition on that attribute
467+
result. This must be a list of tuples, each being a pair
468+
of an attribute name and a condition on that attribute
471469
respectively. The attribute name may be wrapped with a
472470
JPQL function (such as "UPPER(title)").
473471
474472
For backward compatibility with previous versions, this
475473
may alternatively be a mapping of attribute names to a
476-
(lists of) conditions.
474+
(lists of) conditions. This legacy use is deprecated,
475+
though.
477476
:type conditions: :class:`list` of :class:`tuple` or :class:`dict`
478477
:raise ValueError: if any attribute in `conditions` is not valid.
479478

0 commit comments

Comments
 (0)