aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2012-05-10 19:58:35 +0300
committerPeter Eisentraut <peter_e@gmx.net>2012-05-10 20:02:57 +0300
commit1d158d7f9841d7993f7b5990f311e3595db7960b (patch)
tree57bc145d63663b8b90f074d3d3445abc486e1866
parentd9bb75dd37ae1642392b8638c99bfeb9f9890c0a (diff)
downloadpostgresql-1d158d7f9841d7993f7b5990f311e3595db7960b.tar.gz
postgresql-1d158d7f9841d7993f7b5990f311e3595db7960b.zip
Python 2.2 is no longer supported
It was already on its last legs, and it turns out that it was accidentally broken in commit 89e850e6fda9e4e441712012abe971fe938d595a and no one cared. So remove the rest the support for it and update the documentation to indicate that Python 2.3 is now required.
-rw-r--r--doc/src/sgml/installation.sgml2
-rw-r--r--src/pl/plpython/expected/README3
-rw-r--r--src/pl/plpython/plpython.h7
3 files changed, 1 insertions, 11 deletions
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index fe043c60847..609e004a336 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -206,7 +206,7 @@ su - postgres
installation with the header files and
the <application>distutils</application> module. The minimum
required version is <productname>Python</productname>
- 2.2. <productname>Python 3</productname> is supported if it's
+ 2.3. <productname>Python 3</productname> is supported if it's
version 3.1 or later; but see
<![%standalone-include[the <application>PL/Python</> documentation]]>
<![%standalone-ignore[<xref linkend="plpython-python23">]]>
diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README
index 11424877b6f..5bf93668da5 100644
--- a/src/pl/plpython/expected/README
+++ b/src/pl/plpython/expected/README
@@ -9,6 +9,3 @@ plpython_subtransaction_0.out Python 2.4 and older (without with statement)
plpython_subtransaction_5.out Python 2.5 (without with statement)
plpython_types_3.out Python 3.x
-
-Note: Building with Python 2.2 is supported, but there are no expected
-files for it (too much work to maintain).
diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h
index 54ffb4a3bd7..15ec85e8057 100644
--- a/src/pl/plpython/plpython.h
+++ b/src/pl/plpython/plpython.h
@@ -68,13 +68,6 @@ typedef int Py_ssize_t;
#endif
/*
- * PyBool_FromLong is supported from 2.3.
- */
-#if PY_VERSION_HEX < 0x02030000
-#define PyBool_FromLong(x) PyInt_FromLong(x)
-#endif
-
-/*
* Python 2/3 strings/unicode/bytes handling. Python 2 has strings
* and unicode, Python 3 has strings, which are unicode on the C
* level, and bytes. The porting convention, which is similarly used