aboutsummaryrefslogtreecommitdiff
path: root/doc/src
diff options
context:
space:
mode:
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/sgml/installation.sgml2
-rw-r--r--doc/src/sgml/plpython.sgml16
2 files changed, 3 insertions, 15 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index d4904bf5a06..f1adcc3c559 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -196,7 +196,7 @@ su - postgres
language, you need a <productname>Python</productname>
installation with the header files and
the <application>distutils</application> module. The minimum
- required version is <productname>Python</productname> 2.4.
+ required version is <productname>Python</productname> 2.6.
<productname>Python 3</productname> is supported if it's
version 3.1 or later; but see
<xref linkend="plpython-python23"/>
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index c4210925718..7bdaf76bbad 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -1335,9 +1335,8 @@ $$ LANGUAGE plpythonu;
<para>
Context managers syntax using the <literal>with</literal> keyword
- is available by default in Python 2.6. If using PL/Python with an
- older Python version, it is still possible to use explicit
- subtransactions, although not as transparently. You can call the
+ is available by default in Python 2.6. For compatibility with
+ older Python versions, you can call the
subtransaction manager's <literal>__enter__</literal> and
<literal>__exit__</literal> functions using the
<literal>enter</literal> and <literal>exit</literal> convenience
@@ -1367,17 +1366,6 @@ plpy.execute(plan, [result])
$$ LANGUAGE plpythonu;
</programlisting>
</para>
-
- <note>
- <para>
- Although context managers were implemented in Python 2.5, to use
- the <literal>with</literal> syntax in that version you need to
- use a <ulink
- url="https://docs.python.org/release/2.5/ref/future.html">future
- statement</ulink>. Because of implementation details, however,
- you cannot use future statements in PL/Python functions.
- </para>
- </note>
</sect2>
</sect1>