Increase prerequisite from Python 2.4 to Python 2.7.

This means that users of XenServer 6.5 and earlier will need to install
Python 2.7.

Signed-off-by: Ben Pfaff <[email protected]>

COPYING

@@ -39,55 +39,3 @@ Sun Industry Standards Source License 1.1, that is available at:
         http://host-sflow.sourceforge.net/sissl.html
 or the InMon sFlow License, that is available at:
         http://www.inmon.com/technology/sflowlicense.txt
-
-Files under python/compat are licensed under the Python Software
-Foundation License, version 2:
-
-   PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-   --------------------------------------------
-
-   1. This LICENSE AGREEMENT is between the Python Software Foundation
-   ("PSF"), and the Individual or Organization ("Licensee") accessing and
-   otherwise using this software ("Python") in source or binary form and
-   its associated documentation.
-
-   2. Subject to the terms and conditions of this License Agreement, PSF
-   hereby grants Licensee a nonexclusive, royalty-free, world-wide
-   license to reproduce, analyze, test, perform and/or display publicly,
-   prepare derivative works, distribute, and otherwise use Python
-   alone or in any derivative version, provided, however, that PSF's
-   License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-   2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
-   All Rights Reserved" are retained in Python alone or in any derivative
-   version prepared by Licensee.
-
-   3. In the event Licensee prepares a derivative work that is based on
-   or incorporates Python or any part thereof, and wants to make
-   the derivative work available to others as provided herein, then
-   Licensee hereby agrees to include in any such work a brief summary of
-   the changes made to Python.
-
-   4. PSF is making Python available to Licensee on an "AS IS"
-   basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-   IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-   DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-   FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-   INFRINGE ANY THIRD PARTY RIGHTS.
-
-   5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-   A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-   OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-   6. This License Agreement will automatically terminate upon a material
-   breach of its terms and conditions.
-
-   7. Nothing in this License Agreement shall be deemed to create any
-   relationship of agency, partnership, or joint venture between PSF and
-   Licensee.  This License Agreement does not grant permission to use PSF
-   trademarks or trade name in a trademark sense to endorse or promote
-   products or services of Licensee, or any third party.
-
-   8. By copying, installing or otherwise using Python, Licensee
-   agrees to be bound by the terms and conditions of this License
-   Agreement.

INSTALL.XenServer.md

@@ -5,7 +5,10 @@ This document describes how to build and install Open vSwitch on a
 Citrix XenServer host.  If you want to install Open vSwitch on a
 generic Linux or BSD host, see [INSTALL.md] instead.
 
-These instructions have been tested with XenServer 5.6 FP1.
+Open vSwitch should work with XenServer 5.6.100 and later.  However,
+Open vSwitch requires Python 2.7 or later, so using Open vSwitch with
+XenServer 6.5 or earlier requires installing Python 2.7.
+
 
 Building Open vSwitch for XenServer
 -----------------------------------

INSTALL.md

@@ -43,7 +43,7 @@ you will need the following software:
     libssl is installed, then Open vSwitch will automatically build
     with support for it.
 
-  - Python 2.x, for x >= 4.
+  - Python 2.7.
 
 On Linux, you may choose to compile the kernel module that comes with
 the Open vSwitch distribution or to use the kernel module built into
@@ -114,8 +114,6 @@ formats other than plain text, only if you have the following:
   - Perl.  Version 5.10.1 is known to work.  Earlier versions should
     also work.
 
-  - Python 2.x, for x >= 4.
-
 If you are going to extensively modify Open vSwitch, please consider
 installing the following to obtain better warnings:
 

Makefile.am

@@ -51,13 +51,9 @@ endif
 # vSwitch, but it causes trouble if you switch from a version with
 # foo/__init__.py into an (older) version with plain foo.py, since
 # foo/__init__.pyc will cause Python to ignore foo.py.
-if INCLUDE_PYTHON_COMPAT
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$(top_srcdir)/python/compat$(psep)$$PYTHONPATH
-else
-run_python = PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH
-endif
-run_python += PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
-
+run_python = \
+	PYTHONPATH=$(top_srcdir)/python$(psep)$$PYTHONPATH \
+	PYTHONDONTWRITEBYTECODE=yes $(PYTHON)
 
 ALL_LOCAL =
 BUILT_SOURCES =
@@ -375,7 +371,6 @@ include ovsdb/automake.mk
 include rhel/automake.mk
 include xenserver/automake.mk
 include python/automake.mk
-include python/compat/automake.mk
 include tutorial/automake.mk
 include vtep/automake.mk
 include datapath-windows/automake.mk

NEWS

@@ -1,5 +1,8 @@
 Post-v2.4.0
 ---------------------
+   - Dropped support for Python older than version 2.7.  As a consequence,
+     using Open vSwitch 2.5 or later on XenServer 6.5 or earlier (which
+     have Python 2.4) requires first installing Python 2.7.
    - OpenFlow:
      * Group chaining (where one OpenFlow group triggers another) is
        now supported.

configure.ac

@@ -93,7 +93,6 @@ OVS_CHECK_NETLINK
 OVS_CHECK_OPENSSL
 OVS_CHECK_LOGDIR
 OVS_CHECK_PYTHON
-OVS_CHECK_PYTHON_COMPAT
 OVS_CHECK_DOT
 OVS_CHECK_IF_PACKET
 OVS_CHECK_IF_DL

debian/control

@@ -6,7 +6,7 @@ Uploaders: Ben Pfaff <[email protected]>, Simon Horman <[email protected]>
 Build-Depends:
  debhelper (>= 8), autoconf (>= 2.64), automake (>= 1.10) | automake1.10, 
  libssl-dev, bzip2, openssl, graphviz,
- python-all (>= 2.6.6-3~), procps, python-qt4,
+ python-all (>= 2.7), procps, python-qt4,
  python-zopeinterface, python-twisted-conch, libtool
 Standards-Version: 3.9.3
 Homepage: http://openvswitch.org/

debian/copyright.in

@@ -128,64 +128,6 @@ License:
 
 	lib/crc32c.c
 
-* The following components are licensed under the
-  Python Software Foundation License Version 2.
-
-	python/compat/uuid.py
-	python/compat/argparse.py
-
-	* These components are only distributed in the source package.
-	  They do not appear in any binary packages.
-
-   PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
-   --------------------------------------------
-
-   1. This LICENSE AGREEMENT is between the Python Software Foundation
-   ("PSF"), and the Individual or Organization ("Licensee") accessing and
-   otherwise using this software ("Python") in source or binary form and
-   its associated documentation.
-
-   2. Subject to the terms and conditions of this License Agreement, PSF
-   hereby grants Licensee a nonexclusive, royalty-free, world-wide
-   license to reproduce, analyze, test, perform and/or display publicly,
-   prepare derivative works, distribute, and otherwise use Python
-   alone or in any derivative version, provided, however, that PSF's
-   License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
-   2001, 2002, 2003, 2004, 2005, 2006, 2007 Python Software Foundation;
-   All Rights Reserved" are retained in Python alone or in any derivative
-   version prepared by Licensee.
-
-   3. In the event Licensee prepares a derivative work that is based on
-   or incorporates Python or any part thereof, and wants to make
-   the derivative work available to others as provided herein, then
-   Licensee hereby agrees to include in any such work a brief summary of
-   the changes made to Python.
-
-   4. PSF is making Python available to Licensee on an "AS IS"
-   basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
-   IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
-   DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
-   FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
-   INFRINGE ANY THIRD PARTY RIGHTS.
-
-   5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
-   FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
-   A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
-   OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
-
-   6. This License Agreement will automatically terminate upon a material
-   breach of its terms and conditions.
-
-   7. Nothing in this License Agreement shall be deemed to create any
-   relationship of agency, partnership, or joint venture between PSF and
-   Licensee.  This License Agreement does not grant permission to use PSF
-   trademarks or trade name in a trademark sense to endorse or promote
-   products or services of Licensee, or any third party.
-
-   8. By copying, installing or otherwise using Python, Licensee
-   agrees to be bound by the terms and conditions of this License
-   Agreement.
-
 * lib/ovs.tmac in the source distribution, and manpages in the
   binaries, includes troff macros from groff 1.21 that contain the
   following notice:

debian/openvswitch-test.install

@@ -1,3 +1,3 @@
-usr/share/openvswitch/python/ovstest usr/lib/python2.6/dist-packages/
+usr/share/openvswitch/python/ovstest usr/lib/python2.7/dist-packages/
 usr/bin/ovs-test
 usr/bin/ovs-l3ping

debian/python-openvswitch.install

@@ -1 +1 @@
-usr/share/openvswitch/python/ovs usr/lib/python2.6/dist-packages/
+usr/share/openvswitch/python/ovs usr/lib/python2.7/dist-packages/

m4/openvswitch.m4

@@ -249,22 +249,22 @@ dnl Checks for valgrind/valgrind.h.
 AC_DEFUN([OVS_CHECK_VALGRIND],
   [AC_CHECK_HEADERS([valgrind/valgrind.h])])
 
-dnl Checks for Python 2.x, x >= 4.
+dnl Checks for Python 2.x, x >= 7.
 AC_DEFUN([OVS_CHECK_PYTHON],
   [AC_CACHE_CHECK(
-     [for Python 2.x for x >= 4],
+     [for Python 2.x for x >= 7],
      [ovs_cv_python],
      [if test -n "$PYTHON"; then
         ovs_cv_python=$PYTHON
       else
         ovs_cv_python=no
-        for binary in python python2.4 python2.5 python2.7; do
+        for binary in python python2.7; do
           ovs_save_IFS=$IFS; IFS=$PATH_SEPARATOR
           for dir in $PATH; do
             IFS=$ovs_save_IFS
             test -z "$dir" && dir=.
             if test -x "$dir"/"$binary" && "$dir"/"$binary" -c 'import sys
-if sys.hexversion >= 0x02040000 and sys.hexversion < 0x03000000:
+if sys.hexversion >= 0x02070000 and sys.hexversion < 0x03000000:
     sys.exit(0)
 else:
     sys.exit(1)'; then
@@ -297,36 +297,6 @@ AC_DEFUN([OVS_CHECK_DOT],
      fi])
    AM_CONDITIONAL([HAVE_DOT], [test "$ovs_cv_dot" = yes])])
 
-dnl Checks whether $PYTHON supports the module given as $1
-AC_DEFUN([OVS_CHECK_PYTHON_MODULE],
-  [AC_REQUIRE([OVS_CHECK_PYTHON])
-   AC_CACHE_CHECK(
-     [for $1 Python module],
-     [ovs_cv_py_[]AS_TR_SH([$1])],
-     [ovs_cv_py_[]AS_TR_SH([$1])=no
-      if test $HAVE_PYTHON = yes; then
-        AS_ECHO(["running $PYTHON -c 'import $1
-import sys
-sys.exit(0)'..."]) >&AS_MESSAGE_LOG_FD 2>&1
-        if $PYTHON -c 'import $1
-import sys
-sys.exit(0)' >&AS_MESSAGE_LOG_FD 2>&1; then
-          ovs_cv_py_[]AS_TR_SH([$1])=yes
-        fi
-      fi])])
-
-dnl Checks for missing python modules at build time
-AC_DEFUN([OVS_CHECK_PYTHON_COMPAT],
-  [OVS_CHECK_PYTHON_MODULE([uuid])
-   if test $ovs_cv_py_uuid = yes; then
-     INCLUDE_PYTHON_COMPAT=no
-   else
-     INCLUDE_PYTHON_COMPAT=yes
-   fi
-   AC_MSG_CHECKING([whether to add python/compat to PYTHONPATH])
-   AC_MSG_RESULT([$INCLUDE_PYTHON_COMPAT])
-   AM_CONDITIONAL([INCLUDE_PYTHON_COMPAT], [test $INCLUDE_PYTHON_COMPAT = yes])])
-
 dnl Checks for groff.
 AC_DEFUN([OVS_CHECK_GROFF],
   [AC_CACHE_CHECK(