summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/sqlalchemy/orm/__init__.py3
-rw-r--r--lib/sqlalchemy/orm/mapper.py2
-rw-r--r--lib/sqlalchemy/util.py2
3 files changed, 4 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py
index df6997f51..a76f7127c 100644
--- a/lib/sqlalchemy/orm/__init__.py
+++ b/lib/sqlalchemy/orm/__init__.py
@@ -551,7 +551,8 @@ def mapper(class_, local_table=None, *args, **params):
UNION queries.
select_table
- Deprecated. Synonymous with ``with_polymorphic=('*', <selectable>)`.
+ Deprecated. Synonymous with
+ ``with_polymorphic=('*', <selectable>)``.
version_id_col
A ``Column`` which must have an integer type that will be
diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 22f5678d6..e391765c5 100644
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1293,7 +1293,7 @@ class Mapper(object):
"""Iterate each element and its mapper in an object graph,
for all relations that meet the given cascade rule.
- type_
+ type\_
The name of the cascade rule (i.e. save-update, delete,
etc.)
diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index ceabb39eb..101ef1462 100644
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -1026,7 +1026,7 @@ class _symbol(object):
def __reduce__(self):
return symbol, (self.name,)
def __repr__(self):
- return "<symbol '%s'>" % self.name
+ return "<symbol '%s>" % self.name
_symbol.__name__ = 'symbol'
class symbol(object):