tree-wide: remove python3 bindings

.gitignore

@@ -67,10 +67,6 @@ src/lxc/version.h
 src/lxc/cmd/lxc-checkconfig
 src/lxc/cmd/lxc-update-config
 
-src/python-lxc/build/
-src/python-lxc/lxc/__pycache__/
-src/python-lxc/lxc.egg-info/
-
 src/tests/lxc-test-device-add-remove
 src/tests/lxc-test-attach
 src/tests/lxc-test-apparmor

Makefile.am

@@ -13,10 +13,6 @@ EXTRA_DIST = \
 
 RPMARGS =
 
-if ENABLE_PYTHON
-RPMARGS += --with python
-endif
-
 pcdatadir = $(libdir)/pkgconfig
 pcdata_DATA = lxc.pc
 

configure.ac

@@ -363,29 +363,6 @@ AC_ARG_ENABLE([examples],
 	[], [enable_examples=yes])
 AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" = "xyes"])
 
-# Python3 module and scripts
-AC_ARG_ENABLE([python],
-	[AC_HELP_STRING([--enable-python], [enable python binding [default=auto]])],
-	[], [enable_python=auto])
-
-if test "x$enable_python" = "xauto"; then
-	PKG_CHECK_MODULES([PYTHONDEV], [python3 >= 3.2],[enable_python=yes],[enable_python=no])
-	if test "$CC" = "clang"; then
-		enable_python=no
-	fi
-fi
-
-if test "x$enable_python" = "xyes" && test "$CC" = "clang"; then
-	AC_MSG_ERROR([Python3 is incompatible with the clang compiler])
-fi
-
-AM_CONDITIONAL([ENABLE_PYTHON], [test "x$enable_python" = "xyes"])
-
-AM_COND_IF([ENABLE_PYTHON],
-	[AM_PATH_PYTHON([3.2], [], [AC_MSG_ERROR([You must install python3])])
-	PKG_CHECK_MODULES([PYTHONDEV], [python3 >= 3.2],[],[AC_MSG_ERROR([You must install python3-dev])])
-	AC_DEFINE_UNQUOTED([ENABLE_PYTHON], 1, [Python3 is available])])
-
 # Enable dumping stack traces
 AC_ARG_ENABLE([mutex-debugging],
 	[AC_HELP_STRING([--enable-mutex-debugging], [Makes mutexes to report error and provide stack trace [default=no]])],
@@ -894,7 +871,6 @@ AC_CONFIG_FILES([
 	src/lxc/cmd/lxc-checkconfig
 	src/lxc/cmd/lxc-update-config
 	src/lxc/version.h
-	src/python-lxc/Makefile
 
 	src/tests/Makefile
 	src/tests/lxc-test-usernic
@@ -957,9 +933,6 @@ PAM:
  - PAM module: $enable_pam
  - cgroup PAM module: $pamdir
 
-Bindings:
- - python3: $enable_python
-
 Documentation:
  - examples: $enable_examples
  - API documentation: $enable_api_docs

doc/ko/Makefile.am

@@ -41,13 +41,6 @@ man_MANS = \
 	\
 	lxc.7
 
-if ENABLE_DEPRECATED
-    man_MANS += lxc-clone.1
-if ENABLE_PYTHON
-    man_MANS += lxc-start-ephemeral.1
-endif
-endif
-
 %.1 : %.sgml
 	$(db2xman) --encoding=UTF-8 $<
 	test "$(shell basename $@)" != "$@" && mv $(shell basename $@) $@ || true

lxc.spec.in

@@ -20,8 +20,6 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
-%global with_python %{?_with_python: 1} %{?!_with_python: 0}
-
 # Set with_systemd on distros that use it, so we can install the service
 # file, otherwise the sysvinit script will be installed
 %if 0%{?fedora} >= 14 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
@@ -93,12 +91,6 @@ BuildRequires:  libseccomp-devel
 %endif
 %endif
 
-%if %{with_python}
-Requires: python3
-BuildRequires: python3-devel
-BuildRequires: python3-setuptools
-%endif
-
 %description
 Containers are insulated areas inside a system, which have their own namespace
 for filesystem, network, PID, IPC, CPU and memory allocation and which can be
@@ -127,9 +119,6 @@ development of the Linux containers.
 %setup -q -n %{name}-%{version}%{?beta_dot}
 %build
 PATH=$PATH:/usr/sbin:/sbin %configure $args \
-%if %{with_python}
-  --enable-python \
-%endif
 %if "x%{_unitdir}" != "x"
   --with-systemdsystemunitdir=%{_unitdir} \
 %endif
@@ -266,10 +255,6 @@ fi
 %attr(555,root,root) %{_libexecdir}/%{name}/lxc-containers
 %endif
 
-%if %{with_python}
-%{python3_sitearch}/*
-%endif
-
 %files devel
 %defattr(-,root,root)
 %{_includedir}/%{name}/*

src/Makefile.am

-SUBDIRS = lxc tests python-lxc
+SUBDIRS = lxc tests

src/python-lxc/Makefile.am

-if ENABLE_PYTHON
-
-if HAVE_DEBIAN
-    DISTSETUPOPTS=--install-layout=deb
-else
-    DISTSETUPOPTS=
-endif
-
-if ENABLE_RPATH
-    RPATHOPTS=-R $(libdir)
-else
-    RPATHOPTS=
-endif
-
-CALL_SETUP_PY := cd @srcdir@ && $(PYTHON) setup.py build -b @abs_builddir@/build egg_info -e @abs_builddir@
-
-all:
-	$(CALL_SETUP_PY) build_ext -I @abs_top_srcdir@/src -L @abs_top_builddir@/src/lxc/.libs/ $(RPATHOPTS) --no-pkg-config
-
-DESTDIR = / # default
-
-install:
-	$(CALL_SETUP_PY) install --prefix=$(prefix) --no-compile $(DISTSETUPOPTS) --root=$(DESTDIR)
-
-clean-local:
-	rm -rf @builddir@/build
-
-endif
-EXTRA_DIST = \
-	setup.py \
-	lxc.c \
-	lxc/__init__.py \
-	examples/api_test.py \
-	examples/pyconsole.py \
-	examples/pyconsole-vte.py

src/python-lxc/examples/api_test.py

-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# api_test.py: Test/demo of the python3-lxc API
-#
-# (C) Copyright Canonical Ltd. 2012
-#
-# Authors:
-# Stéphane Graber <stgraber@ubuntu.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-# USA
-#
-
-import lxc
-import uuid
-import os
-import subprocess
-import sys
-import time
-
-# Let's pick a random name, avoiding clashes
-CONTAINER_NAME = str(uuid.uuid1())
-CLONE_NAME = str(uuid.uuid1())
-RENAME_NAME = str(uuid.uuid1())
-
-## Instantiate the container instance
-print("Getting instance for '%s'" % CONTAINER_NAME)
-container = lxc.Container(CONTAINER_NAME)
-
-# A few basic checks of the current state
-assert(container.config_file_name == "%s/%s/config" %
-       (lxc.default_config_path, CONTAINER_NAME))
-assert(not container.defined)
-assert(container.init_pid == -1)
-assert(container.name == CONTAINER_NAME)
-assert(not container.running)
-assert(container.state == "STOPPED")
-
-# Try to get the host architecture for dpkg systems
-arch = "i386"
-try:
-    with open(os.path.devnull, "w") as devnull:
-        dpkg = subprocess.Popen(['dpkg', '--print-architecture'],
-                                stderr=devnull, stdout=subprocess.PIPE,
-                                universal_newlines=True)
-
-        if dpkg.wait() == 0:
-            arch = dpkg.stdout.read().strip()
-except:
-    pass
-
-## Create a rootfs
-print("Creating rootfs using 'download', arch=%s" % arch)
-container.create("download", 0,
-                 {"dist": "ubuntu",
-                  "release": "xenial",
-                  "arch": arch})
-
-assert(container.defined)
-assert(container.name == CONTAINER_NAME
-       == container.get_config_item("lxc.uts.name"))
-assert(container.name in lxc.list_containers())
-
-## Test the config
-print("Testing the configuration")
-capdrop = container.get_config_item("lxc.cap.drop")
-container.clear_config_item("lxc.cap.drop")
-container.set_config_item("lxc.cap.drop", capdrop[:-1])
-container.append_config_item("lxc.cap.drop", capdrop[-1])
-container.save_config()
-
-# A few basic checks of the current state
-assert(isinstance(capdrop, list))
-assert(capdrop == container.get_config_item("lxc.cap.drop"))
-
-## Test the networking
-print("Testing the networking")
-
-# A few basic checks of the current state
-assert("name" in container.get_keys("lxc.net.0"))
-assert(len(container.network) == 1)
-
-## Starting the container
-print("Starting the container")
-container.start()
-container.wait("RUNNING", 3)
-
-# A few basic checks of the current state
-assert(container.init_pid > 1)
-assert(container.running)
-assert(container.state == "RUNNING")
-
-
-## Checking IP address
-print("Getting the interface names")
-assert(set(container.get_interfaces()) == set(('lo', 'eth0')))
-
-## Checking IP address
-print("Getting the IP addresses")
-
-count = 0
-ips = []
-while not ips or count == 10:
-    ips = container.get_ips()
-    time.sleep(1)
-    count += 1
-
-if os.geteuid():
-    container.attach_wait(lxc.attach_run_command, ["ifconfig", "eth0"],
-                          namespaces=(lxc.CLONE_NEWUSER + lxc.CLONE_NEWNET
-                                      + lxc.CLONE_NEWUTS))
-else:
-    container.attach_wait(lxc.attach_run_command, ["ifconfig", "eth0"],
-                          namespaces=(lxc.CLONE_NEWNET + lxc.CLONE_NEWUTS))
-
-# A few basic checks of the current state
-assert(len(ips) > 0)
-
-## Test running config
-assert(container.name == CONTAINER_NAME
-       == container.get_config_item("lxc.uts.name")
-       == container.get_running_config_item("lxc.uts.name"))
-
-## Testing cgroups a bit
-print("Testing cgroup API")
-max_mem = container.get_cgroup_item("memory.max_usage_in_bytes")
-current_limit = container.get_cgroup_item("memory.limit_in_bytes")
-assert(container.set_cgroup_item("memory.limit_in_bytes", max_mem))
-assert(container.get_cgroup_item("memory.limit_in_bytes") != current_limit)
-
-## Freezing the container
-print("Freezing the container")
-container.freeze()
-container.wait("FROZEN", 3)
-
-# A few basic checks of the current state
-assert(container.init_pid > 1)
-assert(container.running)
-assert(container.state == "FROZEN")
-
-## Unfreezing the container
-print("Unfreezing the container")
-container.unfreeze()
-container.wait("RUNNING", 3)
-
-# A few basic checks of the current state
-assert(container.init_pid > 1)
-assert(container.running)
-assert(container.state == "RUNNING")
-
-if len(sys.argv) > 1 and sys.argv[1] == "--with-console":
-    ## Attaching to tty1
-    print("Attaching to tty1")
-    container.console(tty=1)
-
-## Shutting down the container
-print("Shutting down the container")
-if not container.shutdown(3):
-    container.stop()
-
-if container.running:
-    print("Stopping the container")
-    container.stop()
-    container.wait("STOPPED", 3)
-
-# A few basic checks of the current state
-assert(container.init_pid == -1)
-assert(not container.running)
-assert(container.state == "STOPPED")
-
-## Snapshotting the container
-print("Snapshotting the container")
-assert(not container.snapshot_list())
-assert(container.snapshot() == "snap0")
-assert(len(container.snapshot_list()) == 1)
-assert(container.snapshot_restore("snap0") is True)
-assert(container.snapshot_destroy("snap0") is True)
-
-## Cloning the container
-print("Cloning the container as '%s'" % CLONE_NAME)
-clone = container.clone(CLONE_NAME)
-assert(clone is not False)
-
-print ("Renaming the clone to '%s'" % RENAME_NAME)
-rename = clone.rename(RENAME_NAME)
-rename.start()
-rename.stop()
-rename.destroy()
-
-## Destroy the container
-print("Destroying the container")
-container.destroy()
-
-assert(not container.defined)

src/python-lxc/examples/pyconsole-vte.py

-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# pyconsole-vte: Example program showing use of console functions
-#                in the lxc python binding
-#
-# (C) Copyright Oracle. 2013
-#
-# Authors:
-# Dwight Engen <dwight.engen@oracle.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-# USA
-#
-
-import gtk
-import vte
-import lxc
-import sys
-
-
-def gtk_exit_cb(terminal):
-    gtk.main_quit()
-
-
-def vte_con(ct, ttynum):
-    print("Doing console in a VTE widget...")
-    masterfd = ct.console_getfd(ttynum)
-    term = vte.Terminal()
-    term.set_cursor_blinks(True)
-    term.set_scrollback_lines(1000)
-    term.connect('eof', gtk_exit_cb)
-
-    term.set_pty(masterfd)
-    term.feed_child('\n')
-    #term.feed_child('ps aux\n')
-
-    vscrollbar = gtk.VScrollbar()
-    vscrollbar.set_adjustment(term.get_adjustment())
-
-    hbox = gtk.HBox()
-    hbox.pack_start(term)
-    hbox.pack_start(vscrollbar)
-
-    window = gtk.Window()
-    window.add(hbox)
-    window.connect('delete-event', lambda window, event: gtk.main_quit())
-    window.show_all()
-    gtk.main()
-    print("Console done")
-
-if __name__ == '__main__':
-    ttynum = -1
-    if len(sys.argv) < 2:
-        sys.exit("Usage: %s container-name [ttynum]" % sys.argv[0])
-    if len(sys.argv) > 2:
-        ttynum = int(sys.argv[2])
-
-    ct = lxc.Container(sys.argv[1])
-
-    print("Container:%s tty:%d" % (ct.name, ttynum))
-    if not ct.defined:
-        sys.exit("Container %s not defined" % ct.name)
-    if not ct.running:
-        sys.exit("Container %s not running" % ct.name)
-
-    vte_con(ct, ttynum)

src/python-lxc/examples/pyconsole.py

-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-#
-# pyconsole: Example program showing use of console functions
-#            in the lxc python binding
-#
-# (C) Copyright Oracle. 2013
-#
-# Authors:
-# Dwight Engen <dwight.engen@oracle.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-# USA
-#
-
-import lxc
-import sys
-import time
-
-if __name__ == '__main__':
-    ttynum = -1
-    escape = 1
-    if len(sys.argv) < 2:
-        sys.exit("Usage: %s container-name [ttynum [escape]]" % sys.argv[0])
-    if len(sys.argv) > 2:
-        ttynum = int(sys.argv[2])
-    if len(sys.argv) > 3:
-        escape = ord(sys.argv[3]) - ord('a') + 1
-
-    ct = lxc.Container(sys.argv[1])
-
-    print("Container:%s tty:%d Ctrl-%c q to quit" %
-          (ct.name, ttynum, ord('a') + escape-1))
-    time.sleep(1)
-    if not ct.defined:
-        sys.exit("Container %s not defined" % ct.name)
-    if not ct.running:
-        sys.exit("Container %s not running" % ct.name)
-
-    ct.console(ttynum, 0, 1, 2, escape)
-    print("Console done")

src/python-lxc/setup.py

-#!/usr/bin/env python3
-#
-# python-lxc: Python bindings for LXC
-#
-# (C) Copyright Canonical Ltd. 2012
-#
-# Authors:
-# Stéphane Graber <stgraber@ubuntu.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
-# USA
-
-import os
-import subprocess
-
-# Fix build when PIE is enabled (must run before setuptools import)
-for var in ("LDFLAGS", "CFLAGS"):
-    current = os.environ.get(var, None)
-    if not current:
-        continue
-
-    new = []
-    for flag in current.split(" "):
-        if flag.lower() in ("-pie", "-fpie"):
-            if "-fPIC" not in new:
-                new.append("-fPIC")
-            continue
-        new.append(flag)
-
-    os.environ[var] = " ".join(new)
-
-from setuptools import setup, Extension
-from setuptools.command.build_ext import build_ext as BuildExtCommand
-
-
-class LxcBuildExtCommand(BuildExtCommand):
-    user_options = BuildExtCommand.user_options + [
-        ('no-pkg-config', None,
-         "don't use pkg-config to detect include/library paths")
-    ]
-
-    def initialize_options(self):
-        super(LxcBuildExtCommand, self).initialize_options()
-        self.no_pkg_config = False
-
-    def build_extensions(self):
-        if not self.no_pkg_config:
-            pkg_config_executable = os.environ.get('PKG_CONFIG_EXECUTABLE',
-                                                   'pkg-config')
-
-            def get_pkg_config_var(name):
-                args = [pkg_config_executable, '--variable', name, 'lxc']
-                output = subprocess.check_output(args,
-                                                 universal_newlines=True)
-                return output.rstrip('\n')
-
-            try:
-                includedir = get_pkg_config_var('includedir')
-                libdir = get_pkg_config_var('libdir')
-
-                self.compiler.add_include_dir(includedir)
-                self.compiler.add_library_dir(libdir)
-
-            except subprocess.CalledProcessError:
-                pass
-
-        super(LxcBuildExtCommand, self).build_extensions()
-
-
-setup(name='lxc',
-      version='0.1',
-      description='LXC',
-      packages=['lxc'],
-      package_dir={'lxc': 'lxc'},
-      ext_modules=[Extension('_lxc', sources=['lxc.c'], libraries=['lxc'])],
-      cmdclass={'build_ext': LxcBuildExtCommand},
-      )