From 1d158d7f9841d7993f7b5990f311e3595db7960b Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Thu, 10 May 2012 19:58:35 +0300 Subject: [PATCH] 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. --- doc/src/sgml/installation.sgml | 2 +- src/pl/plpython/expected/README | 3 --- src/pl/plpython/plpython.h | 7 ------- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml index fe043c6084..609e004a33 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 distutils module. The minimum required version is Python - 2.2. Python 3 is supported if it's + 2.3. Python 3 is supported if it's version 3.1 or later; but see PL/Python documentation]]> ]]> diff --git a/src/pl/plpython/expected/README b/src/pl/plpython/expected/README index 11424877b6..5bf93668da 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 54ffb4a3bd..15ec85e805 100644 --- a/src/pl/plpython/plpython.h +++ b/src/pl/plpython/plpython.h @@ -67,13 +67,6 @@ typedef int Py_ssize_t; #define PY_SSIZE_T_MIN INT_MIN #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