summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-11-03 14:45:18 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-11-03 14:50:20 -0400
commit4f694409615c1ff6c23a5bb941e6c21ae31472a2 (patch)
tree9059990df5d2b450f82427209acf92fc38d5821e
parent8a2cd3464ded779eacc4a08472e8b0b2b65bafd1 (diff)
downloadsqlalchemy-4f694409615c1ff6c23a5bb941e6c21ae31472a2.tar.gz
Fix as many RST parse warnings as possible.
Still a few I can't get. Also 0.9 is EOL so hide the unreleased notes. Change-Id: If0e44d4a0b3e78e211f32d5c33b51b1a007c9c69 (cherry picked from commit 75bdcd096f12012bf45cffebd597c33b501c2ef2) (cherry picked from commit b3502459c385e359babf60b82b8d968849760fa4)
-rw-r--r--doc/build/changelog/changelog_09.rst4
-rw-r--r--lib/sqlalchemy/dialects/postgresql/psycopg2.py11
-rw-r--r--lib/sqlalchemy/dialects/sqlite/base.py4
-rw-r--r--lib/sqlalchemy/orm/session.py20
4 files changed, 18 insertions, 21 deletions
diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index 3ac0ab0b4..8ff15c8f6 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -1,4 +1,3 @@
-
==============
0.9 Changelog
==============
@@ -11,7 +10,7 @@
.. include:: changelog_07.rst
:start-line: 5
-.. changelog::
+.. _unreleased_changelog::
:version: 0.9.11
.. change::
@@ -2047,7 +2046,6 @@
:ref:`relationship_custom_operator`
-
.. change::
:tags: bug, sqlite
diff --git a/lib/sqlalchemy/dialects/postgresql/psycopg2.py b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
index 5421a0a5e..ca5614018 100644
--- a/lib/sqlalchemy/dialects/postgresql/psycopg2.py
+++ b/lib/sqlalchemy/dialects/postgresql/psycopg2.py
@@ -5,12 +5,11 @@
# This module is part of SQLAlchemy and is released under
# the MIT License: http://www.opensource.org/licenses/mit-license.php
-"""
+r"""
.. dialect:: postgresql+psycopg2
:name: psycopg2
:dbapi: psycopg2
- :connectstring: postgresql+psycopg2://user:password@host:port/dbname\
-[?key=value&key=value...]
+ :connectstring: postgresql+psycopg2://user:password@host:port/dbname[?key=value&key=value...]
:url: http://pypi.python.org/pypi/psycopg2/
psycopg2 Connect Arguments
@@ -30,6 +29,7 @@ psycopg2-specific keyword arguments which are accepted by
time are fetched over the wire to reduce conversational overhead.
Note that the ``stream_results=True`` execution option is a more targeted
way of enabling this mode on a per-execution basis.
+
* ``use_native_unicode``: Enable the usage of Psycopg2 "native unicode" mode
per connection. True by default.
@@ -69,10 +69,9 @@ using ``host`` as an additional keyword argument::
create_engine("postgresql+psycopg2://user:password@/dbname?\
host=/var/lib/postgresql")
-See also:
+.. seealso::
-`PQconnectdbParams <http://www.postgresql.org/docs/9.1/static/\
-libpq-connect.html#LIBPQ-PQCONNECTDBPARAMS>`_
+ `PQconnectdbParams <http://www.postgresql.org/docs/9.1/static/libpq-connect.html#LIBPQ-PQCONNECTDBPARAMS>`_
.. _psycopg2_execution_options:
diff --git a/lib/sqlalchemy/dialects/sqlite/base.py b/lib/sqlalchemy/dialects/sqlite/base.py
index 837a30249..77f45f2f1 100644
--- a/lib/sqlalchemy/dialects/sqlite/base.py
+++ b/lib/sqlalchemy/dialects/sqlite/base.py
@@ -527,8 +527,7 @@ class DATETIME(_DateTimeMixin, sqltypes.DateTime):
The default string storage format is::
- "%(year)04d-%(month)02d-%(day)02d %(hour)02d:%(min)02d:\
-%(second)02d.%(microsecond)06d"
+ "%(year)04d-%(month)02d-%(day)02d %(hour)02d:%(min)02d:%(second)02d.%(microsecond)06d"
e.g.::
@@ -554,6 +553,7 @@ class DATETIME(_DateTimeMixin, sqltypes.DateTime):
Otherwise, if positional groups are used, the datetime() constructor
is called with positional arguments via
``*map(int, match_obj.groups(0))``.
+
"""
_storage_format = (
diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index da7056042..1527fcab3 100644
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -179,25 +179,25 @@ class SessionTransaction(object):
.. seealso::
- :meth:`.Session.rollback`
+ :meth:`.Session.rollback`
- :meth:`.Session.commit`
+ :meth:`.Session.commit`
- :meth:`.Session.begin`
+ :meth:`.Session.begin`
- :meth:`.Session.begin_nested`
+ :meth:`.Session.begin_nested`
- :attr:`.Session.is_active`
+ :attr:`.Session.is_active`
- :meth:`.SessionEvents.after_transaction_create`
+ :meth:`.SessionEvents.after_transaction_create`
- :meth:`.SessionEvents.after_transaction_end`
+ :meth:`.SessionEvents.after_transaction_end`
- :meth:`.SessionEvents.after_commit`
+ :meth:`.SessionEvents.after_commit`
- :meth:`.SessionEvents.after_rollback`
+ :meth:`.SessionEvents.after_rollback`
- :meth:`.SessionEvents.after_soft_rollback`
+ :meth:`.SessionEvents.after_soft_rollback`
"""