From f524fe4934d41fc08173cd61f49c385207d42390 Mon Sep 17 00:00:00 2001 From: Kenneth Reitz Date: Tue, 11 Oct 2011 08:05:11 -0400 Subject: [PATCH] python version support update --- docs/community/faq.rst | 18 +++++++++++++++++- docs/user/intro.rst | 21 +-------------------- 2 files changed, 18 insertions(+), 21 deletions(-) diff --git a/docs/community/faq.rst b/docs/community/faq.rst index 5671d3b..91ca06b 100644 --- a/docs/community/faq.rst +++ b/docs/community/faq.rst @@ -51,7 +51,23 @@ Chris Adams gave an excellent summary on Python 3 Support? ----------------- -It's on the way. Here's a list of `supported interpreters `_. +It's on the way. Here's a list of Python platforms that are officially +supported: + +* cPython 2.5 +* cPython 2.5.5 +* cPython 2.5.6 +* cPython 2.6 +* cPython 2.6.6 +* cPython 2.6.7 +* cPython 2.7 +* cPython 2.7.1 +* cPython 2.7.2 +* PyPy-c 1.4 +* PyPy-c 1.5 + + +Support for Python 3.x is coming *very* soon. Keep-alive Support? diff --git a/docs/user/intro.rst b/docs/user/intro.rst index 9837fa1..c2b6bf3 100644 --- a/docs/user/intro.rst +++ b/docs/user/intro.rst @@ -48,23 +48,4 @@ Requests License THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.. _interpreters: -Python Interpreters -------------------- - -At this time, the following Python platforms are officially supported: - -* cPython 2.5 -* cPython 2.5.5 -* cPython 2.5.6 -* cPython 2.6 -* cPython 2.6.6 -* cPython 2.6.7 -* cPython 2.7 -* cPython 2.7.1 -* cPython 2.7.2 -* PyPy-c 1.4 -* PyPy-c 1.5 - - -Support for Python 3.x is planned. + -- 2.34.1