Drop support for python 2

python2 will be end of life by the time of the next
libvirt release. All our supported build targets, including
CentOS7, have a python3 build available.

Reviewed-by: Michal Privoznik <[email protected]>
Signed-off-by: Daniel P. Berrangé <[email protected]>

Author: berrange

Diff for: .travis.yml

@@ -3,7 +3,6 @@ os: linux
 dist: xenial
 
 python:
-  - 2.7
   - 3.6
 
 env:

Diff for: examples/consolecallback.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # consolecallback - provide a persistent console that survives guest reboots
 
 import sys, os, logging, libvirt, tty, termios, atexit

Diff for: examples/dhcpleases.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # netdhcpleases - print leases info for given virtual network
 
 import libvirt

Diff for: examples/dominfo.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # dominfo - print some information about a domain
 
 import libvirt

Diff for: examples/domipaddrs.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # domipaddrs - print domain interfaces along with their MAC and IP addresses
 
 import libvirt

Diff for: examples/domrestore.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # domstart - make sure a given domU is running, if not start it
 
 import libvirt

Diff for: examples/domsave.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # domstart - make sure a given domU is running, if not start it
 
 import libvirt

Diff for: examples/domstart.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # domstart - make sure a given domU is running, if not start it
 
 import libvirt

Diff for: examples/esxlist.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # esxlist - list active domains of an ESX host and print some info.
 #           also demonstrates how to use the libvirt.openAuth() method
 

Diff for: examples/event-test.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 #
 #

Diff for: examples/guest-vcpus/guest-vcpu-daemon.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import libvirt
 import threading

Diff for: examples/guest-vcpus/guest-vcpu.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import libvirt
 import sys

Diff for: examples/nodestats.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Print some host NUMA node statistics
 #
 # Authors:

Diff for: examples/sparsestream.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Example of sparse streams usage
 #
 # Authors:

Diff for: examples/topology.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Parse topology information from the capabilities XML and use
 # them to calculate host topology
 #

Diff for: generator.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # generate python wrappers from the XML API description
 #

Diff for: libvirt-lxc-override.c

@@ -4,13 +4,13 @@
  *           entry points where an automatically generated stub is
  *           unpractical
  *
- * Copyright (C) 2012-2013 Red Hat, Inc.
+ * Copyright (C) 2012-2019 Red Hat, Inc.
  *
  * Daniel Veillard <[email protected]>
  */
 
 /* Horrible kludge to work around even more horrible name-space pollution
-   via Python.h.  That file includes /usr/include/python2.5/pyconfig*.h,
+   via Python.h.  That file includes /usr/include/python3.x/pyconfig*.h,
    which has over 180 autoconf-style HAVE_* definitions.  Shame on them.  */
 #undef HAVE_PTHREAD_H
 
@@ -21,18 +21,10 @@
 #include "libvirt-utils.h"
 #include "build/libvirt-lxc.h"
 
-#if PY_MAJOR_VERSION > 2
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
 extern PyObject *PyInit_libvirtmod_lxc(void);
-# else
-extern PyObject *PyInit_cygvirtmod_lxc(void);
-# endif
 #else
-# ifndef __CYGWIN__
-extern void initlibvirtmod_lxc(void);
-# else
-extern void initcygvirtmod_lxc(void);
-# endif
+extern PyObject *PyInit_cygvirtmod_lxc(void);
 #endif
 
 #if 0
@@ -107,14 +99,13 @@ static PyMethodDef libvirtLxcMethods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-#if PY_MAJOR_VERSION > 2
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
     "libvirtmod_lxc",
-# else
+#else
     "cygvirtmod_lxc",
-# endif
+#endif
     NULL,
     -1,
     libvirtLxcMethods,
@@ -125,11 +116,11 @@ static struct PyModuleDef moduledef = {
 };
 
 PyObject *
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
 PyInit_libvirtmod_lxc
-# else
+#else
 PyInit_cygvirtmod_lxc
-# endif
+#endif
 (void)
 {
     PyObject *module;
@@ -141,25 +132,3 @@ PyInit_cygvirtmod_lxc
 
     return module;
 }
-#else /* ! PY_MAJOR_VERSION > 2 */
-void
-# ifndef __CYGWIN__
-initlibvirtmod_lxc
-# else
-initcygvirtmod_lxc
-# endif
-(void)
-{
-    if (virInitialize() < 0)
-        return;
-
-    /* initialize the python extension module */
-    Py_InitModule((char *)
-# ifndef __CYGWIN__
-                  "libvirtmod_lxc",
-# else
-                  "cygvirtmod_lxc",
-# endif
-                  libvirtLxcMethods);
-}
-#endif /* ! PY_MAJOR_VERSION > 2 */

Diff for: libvirt-override.c

@@ -4,13 +4,13 @@
  *           entry points where an automatically generated stub is
  *           unpractical
  *
- * Copyright (C) 2005, 2007-2015 Red Hat, Inc.
+ * Copyright (C) 2005-2019 Red Hat, Inc.
  *
  * Daniel Veillard <[email protected]>
  */
 
 /* Horrible kludge to work around even more horrible name-space pollution
-   via Python.h.  That file includes /usr/include/python2.5/pyconfig*.h,
+   via Python.h.  That file includes /usr/include/python3.x/pyconfig*.h,
    which has over 180 autoconf-style HAVE_* definitions.  Shame on them.  */
 #undef HAVE_PTHREAD_H
 
@@ -25,18 +25,10 @@
 #include "build/libvirt.h"
 #include "libvirt-utils.h"
 
-#if PY_MAJOR_VERSION > 2
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
 extern PyObject *PyInit_libvirtmod(void);
-# else
-extern PyObject *PyInit_cygvirtmod(void);
-# endif
 #else
-# ifndef __CYGWIN__
-extern void initlibvirtmod(void);
-# else
-extern void initcygvirtmod(void);
-# endif
+extern PyObject *PyInit_cygvirtmod(void);
 #endif
 
 #if 0
@@ -10553,14 +10545,13 @@ static PyMethodDef libvirtMethods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-#if PY_MAJOR_VERSION > 2
 static struct PyModuleDef moduledef = {
     PyModuleDef_HEAD_INIT,
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
     "libvirtmod",
-# else
+#else
     "cygvirtmod",
-# endif
+#endif
     NULL,
     -1,
     libvirtMethods,
@@ -10571,11 +10562,11 @@ static struct PyModuleDef moduledef = {
 };
 
 PyObject *
-# ifndef __CYGWIN__
+#ifndef __CYGWIN__
 PyInit_libvirtmod
-# else
+#else
 PyInit_cygvirtmod
-# endif
+#endif
 (void)
 {
     PyObject *module;
@@ -10587,25 +10578,3 @@ PyInit_cygvirtmod
 
     return module;
 }
-#else /* ! PY_MAJOR_VERSION > 2 */
-void
-# ifndef __CYGWIN__
-initlibvirtmod
-# else
-initcygvirtmod
-# endif
-(void)
-{
-    if (virInitialize() < 0)
-        return;
-
-    /* initialize the python extension module */
-    Py_InitModule((char *)
-# ifndef __CYGWIN__
-                  "libvirtmod",
-# else
-                  "cygvirtmod",
-# endif
-                  libvirtMethods);
-}
-#endif /* ! PY_MAJOR_VERSION > 2 */