diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-11 10:12:12 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-01-13 10:57:41 -0500 |
| commit | fa6dd376bb24845724287d980a98ea50eb1cfab1 (patch) | |
| tree | 91e536c76f4b76b8997b02f5cd5a41de29dc90ef /lib/sqlalchemy/orm/interfaces.py | |
| parent | c703b9ce89483b6f44b97d1fbf56f8df8b14305a (diff) | |
| download | sqlalchemy-fa6dd376bb24845724287d980a98ea50eb1cfab1.tar.gz | |
Support python3.6
Corrects some warnings and adds tox config. Adds DeprecationWarning
to the error category. Large sweep for string literals w/ backslashes
as this is common in docstrings
Co-authored-by: Andrii Soldatenko
Fixes: #3886
Change-Id: Ia7c838dfbbe70b262622ed0803d581edc736e085
Pull-request: https://github.com/zzzeek/sqlalchemy/pull/337
Diffstat (limited to 'lib/sqlalchemy/orm/interfaces.py')
| -rw-r--r-- | lib/sqlalchemy/orm/interfaces.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/sqlalchemy/orm/interfaces.py b/lib/sqlalchemy/orm/interfaces.py index dbf8a1b5d..3fad83ef4 100644 --- a/lib/sqlalchemy/orm/interfaces.py +++ b/lib/sqlalchemy/orm/interfaces.py @@ -247,7 +247,7 @@ class MapperProperty(_MappedAttribute, InspectionAttr, util.MemoizedSlots): class PropComparator(operators.ColumnOperators): - """Defines SQL operators for :class:`.MapperProperty` objects. + r"""Defines SQL operators for :class:`.MapperProperty` objects. SQLAlchemy allows for operators to be redefined at both the Core and ORM level. :class:`.PropComparator` @@ -273,9 +273,9 @@ class PropComparator(operators.ColumnOperators): # definition of custom PropComparator subclasses - from sqlalchemy.orm.properties import \\ - ColumnProperty,\\ - CompositeProperty,\\ + from sqlalchemy.orm.properties import \ + ColumnProperty,\ + CompositeProperty,\ RelationshipProperty class MyColumnComparator(ColumnProperty.Comparator): @@ -387,14 +387,14 @@ class PropComparator(operators.ColumnOperators): return a.of_type(class_) def of_type(self, class_): - """Redefine this object in terms of a polymorphic subclass. + r"""Redefine this object in terms of a polymorphic subclass. Returns a new PropComparator from which further criterion can be evaluated. e.g.:: - query.join(Company.employees.of_type(Engineer)).\\ + query.join(Company.employees.of_type(Engineer)).\ filter(Engineer.name=='foo') :param \class_: a class or mapper indicating that criterion will be @@ -406,7 +406,7 @@ class PropComparator(operators.ColumnOperators): return self.operate(PropComparator.of_type_op, class_) def any(self, criterion=None, **kwargs): - """Return true if this collection contains any member that meets the + r"""Return true if this collection contains any member that meets the given criterion. The usual implementation of ``any()`` is @@ -424,7 +424,7 @@ class PropComparator(operators.ColumnOperators): return self.operate(PropComparator.any_op, criterion, **kwargs) def has(self, criterion=None, **kwargs): - """Return true if this element references a member which meets the + r"""Return true if this element references a member which meets the given criterion. The usual implementation of ``has()`` is |
