Merge lp:~muktupavels/compiz/ccsm-python3 into lp:compiz/0.9.13

[Alberts Muktupāvels]

Port CCSM to Python 3.

[Dmitry Shachnev (mitya57)]

The code changes look good to me.

Wuth regards to debian packaging, I have not tested it yet but added some comments anyway.

review: Needs Fixing

[lp:~muktupavels/compiz/ccsm-python3]

4183. By Alberts Muktupāvels on 2018-08-01

Port CCSM to Python 3.

[Dmitry Shachnev (mitya57)]

The packaging is fine now. For those who want to test it, it’s available in https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3336.

Note that it will need a no-change rebuild for Python default version change (e.g. 3.6 → 3.7).

review: Approve

[lp:~muktupavels/compiz/ccsm-python3]

4184. By Alberts Muktupāvels on 2018-08-01

Remove python3-compizconfig.lintian-overrides.

[Khurshid Alam (khurshid-alam)]

Is this safe for unity? I didn't find anything related. But did you speak with 3v1n0?

[Alberts Muktupāvels (muktupavels)]

Why would it be unsafe? I don't see what problems this could cause except for regressions in ccsm because of python2 -> python3 and/or gtk 2 -> gtk 3, and/or pygtk to pygobject.

[Andrea Azzarone (azzar1)]

LGTM. Still need to run this. Could you please take a look to the only line-comment?

[Andrea Azzarone (azzar1)]

Would it make sense to rename compizconfig-python.pc into compizconfig-python3.pc? This way you would not need to break/replace it because the two new packages will not conflict. @3v1n0 what do you think?

[lp:~muktupavels/compiz/ccsm-python3]

4185. By Alberts Muktupāvels on 2018-08-14

Rename compizconfig-python.pc to compizconfig-python3.pc and remove Breaks/Replaces.

[Dmitry Shachnev (mitya57)]

I think the .pc file for Python is just not needed, nothing is using it now.

[Alberts Muktupāvels (muktupavels)]

compizconfig-python3.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include
pyexecdir=

Name: compizconfig-python3
Version: 0.9.13.1
Description: Compiz configuration system bindings

Requires:
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

libcompizconfig.pc:
prefix=/usr
exec_prefix=/usr/bin
libdir=/usr/lib/x86_64-linux-gnu
includedir=/usr/include/compizconfig

Name: libcompizconfig
Description: Compiz configuration system
Version: 0.9.13.1

Requires: compiz
Libs: -L/usr/lib/x86_64-linux-gnu -lcompizconfig
Cflags: -I/usr/include/compizconfig

Both files would find libcompizconfig.so that is installed by libcompizconfig0-dev. Seems useless file to me.

[lp:~muktupavels/compiz/ccsm-python3]

4186. By Alberts Muktupāvels on 2018-08-14

Remove compizconfig-python3.pc.

[Andrea Azzarone (azzar1)]

Changes looks good to me now. You need to propose a change for unity-autopilot too in order to get this accepted. Also a FFE is required (https://wiki.ubuntu.com/FreezeExceptionProcess)

[Andrea Azzarone (azzar1)]

unity-autopilot is python2 code. You have two options here:
1) have both python-compizconfig and python3-compizconfig
2) port unity-autopilot to python3 (tbh I'm not sure how much work this would be)

[lp:~muktupavels/compiz/ccsm-python3]

4187. By Alberts Muktupāvels on 2018-09-05

Fix inconsistent use of tabs and spaces in indentation.

[Dmitry Shachnev (mitya57)]

unity-autopilot is ported in https://code.launchpad.net/~muktupavels/unity/+git/unity/+merge/359969. We finally got the tests to pass on all architectures, so let's ship it.

=== modified file 'compizconfig/ccsm/CMakeLists.txt'
--- compizconfig/ccsm/CMakeLists.txt	2012-10-16 13:53:20 +0000
+++ compizconfig/ccsm/CMakeLists.txt	2018-09-05 09:24:50 +0000
@@ -10,14 +10,12 @@
 
 # Get arch
 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
+string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
 
 # Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
-		 OUTPUT_VARIABLE PY_VERSION)
-
-string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
-string (REPLACE "\n" "" PY_VERSION ${PY_VERSION})
-
+find_package (PythonInterp 3.0 REQUIRED)
+
+set (PY_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
 set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})
 set (PY_SCRIPTS_DIR scripts-${PY_VERSION})
 
@@ -36,19 +34,17 @@
 set (VERSION ${COMPIZ_RELEASE_VERSION})
 
 add_custom_command (OUTPUT ${PY_CCSM_LIB}
-		    COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
+		    COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py build --build-base=${CMAKE_CURRENT_BINARY_DIR}/build --version=${VERSION}
 		    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 		    COMMENT "Generating Python Bytecode")
 
 add_custom_target (ccsm_module ALL DEPENDS
                    ${PY_CCSM_LIB})
 
-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
+set (UNINSTALL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
 
 compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_SOURCE_DIR})
 
 install (CODE
 	 "message (\"Installing python files\")
-	  execute_process (COMMAND cmake -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_SOURCE_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")
-
-
+	  execute_process (COMMAND cmake -DPY_EXECUTABLE=${PYTHON_EXECUTABLE} -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_SOURCE_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")

=== modified file 'compizconfig/ccsm/ccsm'
--- compizconfig/ccsm/ccsm	2018-07-11 21:59:31 +0000
+++ compizconfig/ccsm/ccsm	2018-09-05 09:24:50 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: UTF-8 -*-
 
 # This program is free software; you can redistribute it and/or

=== added file 'compizconfig/ccsm/setup.cfg'
--- compizconfig/ccsm/setup.cfg	1970-01-01 00:00:00 +0000
+++ compizconfig/ccsm/setup.cfg	2018-09-05 09:24:50 +0000
@@ -0,0 +1,2 @@
+[build]
+executable = /usr/bin/env python3

=== modified file 'compizconfig/ccsm/setup.py'
--- compizconfig/ccsm/setup.py	2013-04-28 04:26:33 +0000
+++ compizconfig/ccsm/setup.py	2018-09-05 09:24:50 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import sys, os, glob
 import subprocess
@@ -48,15 +48,15 @@
         # Update icon cache
         gtk_update_icon_cache = '''gtk-update-icon-cache -f -t \
 %s''' % icon_prefix
-        root_specified = len (filter (lambda s: s.startswith ("--root"),
-                                      sys.argv)) > 0
+        root_specified = len (list (filter (lambda s: s.startswith ("--root"),
+                                            sys.argv))) > 0
         if not root_specified:
-            print "Updating Gtk icon cache."
+            print ("Updating Gtk icon cache.")
             os.system (gtk_update_icon_cache)
             outputs.append (icon_theme_cache)
         else:
-            print '''*** Icon cache not updated. After install, run this:
-***     %s''' % gtk_update_icon_cache
+            print ('''*** Icon cache not updated. After install, run this:
+***     %s''' % gtk_update_icon_cache)
 
         length = 0
         if self.root:
@@ -64,7 +64,7 @@
         if self.prefix:
             length += len (self.prefix)
         if length:
-            for counter in xrange (len (outputs)):
+            for counter in range (len (outputs)):
                 outputs[counter] = outputs[counter][length:]
         data = "\n".join (outputs)
         try:
@@ -114,10 +114,10 @@
         if self.prefix:
             prepend += self.prefix
         if len (prepend):
-            for counter in xrange (len (files)):
+            for counter in range (len (files)):
                 files[counter] = prepend + files[counter].rstrip ()
         for file in files:
-            print "Uninstalling %s" % file
+            print ("Uninstalling %s" % file)
             try:
                 os.unlink (file)
             except:
@@ -126,7 +126,7 @@
 ops = ("install", "build", "sdist", "uninstall", "clean")
 
 if len (sys.argv) < 2 or sys.argv[1] not in ops:
-    print "Please specify operation : %s" % " | ".join (ops)
+    print ("Please specify operation : %s" % " | ".join (ops))
     raise SystemExit
 
 prefix = None

=== modified file 'compizconfig/cmake/exec_setup_py_with_destdir.cmake'
--- compizconfig/cmake/exec_setup_py_with_destdir.cmake	2012-09-06 12:17:40 +0000
+++ compizconfig/cmake/exec_setup_py_with_destdir.cmake	2018-09-05 09:24:50 +0000
@@ -1,3 +1,4 @@
+set (PY_EXECUTABLE "" CACHE FORCE "Python executable")
 set (WDIR "" CACHE FORCE "Working Directory")
 set (PREFIX "" CACHE FORCE "Prefix")
 set (SETUP "" CACHE FORCE "Path to setup.py")
@@ -21,5 +22,5 @@
     set (EXTRAARGS "--install-layout=deb")
 endif (BUILD_DEB)
 
-execute_process (COMMAND python ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}
+execute_process (COMMAND ${PY_EXECUTABLE} ${SETUP} install ${EXTRAARGS} --prefix=${PREFIX} --version=${VERSION} ${INSTALL_ROOT_ARGS}
 	 		   WORKING_DIRECTORY ${WDIR})

=== modified file 'compizconfig/compizconfig-python/CMakeLists.txt'
--- compizconfig/compizconfig-python/CMakeLists.txt	2018-06-27 10:30:36 +0000
+++ compizconfig/compizconfig-python/CMakeLists.txt	2018-09-05 09:24:50 +0000
@@ -3,34 +3,20 @@
 
 # Get arch
 execute_process (COMMAND uname -p OUTPUT_VARIABLE PROC_ARCH)
-
-# Get Python Version
-execute_process (COMMAND python -c "import sys; print str (sys.version_info[0]) + '.' + str (sys.version_info[1])"
-		 OUTPUT_VARIABLE PY_VERSION)
-
-include (FindPkgConfig)
-pkg_check_modules (PYTHON python-2.7)
-
-# This is a workaround for a broken FindPythonLibs always finding the
-# wrong library version because PYTHON_LIBRARY is in the cache and
-# can't be overwritten
-string (REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" PYTHON_CURRENT_VERSION ${PY_VERSION})
-string (REPLACE "." "" PYTHON_CURRENT_VERSION_NO_DOTS ${PYTHON_CURRENT_VERSION})
-find_library (PYTHON_LIBRARY_LOCAL
-	      NAMES python${PYTHON_CURRENT_VERSION_NO_DOTS} python${PYTHON_CURRENT_VERSION}
-	      PATH_SUFFIXES python${PYTHON_CURRENT_VERSION}/config)
+string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
+
+find_package (PythonInterp 3.0 REQUIRED)
+find_package (PythonLibs 3.0 REQUIRED)
 
 set (COMPIZCONFIG_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/compizconfig/libcompizconfig/include)
 
-string (REPLACE "\n" "" PROC_ARCH ${PROC_ARCH})
-string (REPLACE "\n" "" PY_VERSION ${PY_VERSION})
-
+set (PY_VERSION "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
 set (PY_BUILD_DIR lib.linux-${PROC_ARCH}-${PY_VERSION})
 set (PY_SCRIPTS_DIR scripts-${PY_VERSION})
 set (PY_COMPIZCONFIG_SRC ${CMAKE_CURRENT_BINARY_DIR}/compizconfig.c)
 set (PY_COMPIZCONFIG_CYTHON ${CMAKE_CURRENT_SOURCE_DIR}/src/compizconfig.pyx)
 
-find_program(CYTHON_BIN cython)
+find_program(CYTHON_BIN cython3)
 if(NOT CYTHON_BIN)
   message(FATAL_ERROR "Can not build because cython binary not found.")
 endif()
@@ -44,9 +30,6 @@
 string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
 set (VERSION ${COMPIZ_RELEASE_VERSION})
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/compizconfig-python.pc.in
-                ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc)
-
 include_directories (${PYTHON_INCLUDE_DIRS}
 		     ${COMPIZCONFIG_INCLUDE_DIRS})
 
@@ -76,16 +59,13 @@
 		       compizconfig)
 
 target_link_libraries (compizconfig_python_module
-		       ${PYTHON_LIBRARY_LOCAL}
+		       ${PYTHON_LIBRARIES}
 		       compizconfig)
 
-set (UNINSTALL_COMMAND "python ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
+set (UNINSTALL_COMMAND "${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/setup.py uninstall --prefix=${CMAKE_INSTALL_PREFIX} --version=${VERSION}")
 
 compiz_add_code_to_uninstall_target (${UNINSTALL_COMMAND} ${CMAKE_CURRENT_BINARY_DIR})
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/compizconfig-python.pc
-         DESTINATION ${libdir}/pkgconfig)
-
 # This is probably not very portable, but we can't install using distutils
 # as we cannot build with it safely
 
@@ -102,12 +82,11 @@
 
 install (CODE
 	 "message (\"Installing python files\")
-	  execute_process (COMMAND cmake -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_BINARY_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")
+	  execute_process (COMMAND cmake -DPY_EXECUTABLE=${PYTHON_EXECUTABLE} -DSETUP=${CMAKE_CURRENT_SOURCE_DIR}/setup.py -DPREFIX=${CMAKE_INSTALL_PREFIX} -DWDIR=${CMAKE_CURRENT_BINARY_DIR} -DVERSION=${VERSION} -P ${compiz_SOURCE_DIR}/compizconfig/cmake/exec_setup_py_with_destdir.cmake)")
 
 if (COMPIZ_BUILD_TESTING)
 
         find_program (BASH_EXECUTABLE bash)
-	find_program (PYTHON_EXECUTABLE python)
 	mark_as_advanced (FORCE PYTHON_EXECUTABLE)
 
 	file (GLOB PYTHON_TESTS "tests/test_*.py")

=== removed file 'compizconfig/compizconfig-python/compizconfig-python.pc.in'
--- compizconfig/compizconfig-python/compizconfig-python.pc.in	2012-09-04 01:00:10 +0000
+++ compizconfig/compizconfig-python/compizconfig-python.pc.in	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-pyexecdir=@pyexecdir@
-
-Name: compizconfig-python
-Version: @VERSION@
-Description: Compiz configuration system bindings
-
-Requires: @CCS_REQUIRES@
-Libs: @CCS_LIBS@ -L@libdir@ -lcompizconfig
-Cflags: @CCS_CFLAGS@ -I@includedir@/compizconfig

=== modified file 'compizconfig/compizconfig-python/setup.py'
--- compizconfig/compizconfig-python/setup.py	2018-07-16 23:14:30 +0000
+++ compizconfig/compizconfig-python/setup.py	2018-09-05 09:24:50 +0000
@@ -18,7 +18,6 @@
   print ("CompizConfig Python [ERROR]: No libcompizconfig_internal.pc found in the pkg-config search path")
   print ("Ensure that libcompizonfig is installed or libcompizconfig.pc is in your $PKG_CONFIG_PATH")
   exit (1);
-libs = pkgconfig_libs[2:].split (" ")[0]
 
 INSTALLED_FILES = "installed_files"
 
@@ -59,7 +58,7 @@
         if self.prefix:
             length += len (self.prefix)
         if length:
-            for counter in xrange (len (outputs)):
+            for counter in range (len (outputs)):
                 outputs[counter] = outputs[counter][length:]
         data = "\n".join (outputs)
         try:
@@ -109,7 +108,7 @@
         if self.prefix:
             prepend += self.prefix
         if len (prepend):
-            for counter in xrange (len (files)):
+            for counter in range (len (files)):
                 files[counter] = prepend + files[counter].rstrip ()
         for file in files:
             print ("Uninstalling %s" % file)

=== modified file 'compizconfig/compizconfig-python/src/compizconfig.pyx'
--- compizconfig/compizconfig-python/src/compizconfig.pyx	2018-06-27 10:30:36 +0000
+++ compizconfig/compizconfig-python/src/compizconfig.pyx	2018-09-05 09:24:50 +0000
@@ -1,3 +1,4 @@
+# cython: c_string_type=str, c_string_encoding=ascii
 '''
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public License
@@ -770,10 +771,10 @@
             if t == TypeString and i.forString.extensible:
                 self.hasExtendedString = True
 
-            if not self.ranking.has_key (ccsSettingGetName (sett)):
+            if ccsSettingGetName (sett) not in self.ranking:
                 self.ranking[ccsSettingGetName (sett)] = rank
                 rank = rank + 1
-            
+
             setlist = setlist.next
 
         self.loaded = True
@@ -1136,7 +1137,7 @@
                 cat = ''
             else:
                 cat = ccsPluginGetCategory (pl)
-            if not self.categories.has_key (cat):
+            if cat not in self.categories:
                 self.categories[cat] = []
             self.categories[cat].append (self.plugins[ccsPluginGetName (pl)])
             pll = pll.next

=== modified file 'compizconfig/compizconfig-python/tests/test_backend.py'
--- compizconfig/compizconfig-python/tests/test_backend.py	2012-05-21 15:40:47 +0000
+++ compizconfig/compizconfig-python/tests/test_backend.py	2018-09-05 09:24:50 +0000
@@ -5,15 +5,15 @@
 
     def runTest (self):
 
-	info = ["ini", "Ini Backend", "Flat File Backend", True, False]
-
-	backend = self.ccs.Backend (self.context, info)
-
-	self.assertEqual (backend.Name, "ini")
-	self.assertEqual (backend.ShortDesc, "Ini Backend")
-	self.assertEqual (backend.LongDesc, "Flat File Backend")
-	self.assertEqual (backend.IntegrationSupport, False)
-	self.assertEqual (backend.ProfileSupport, True)
+        info = ["ini", "Ini Backend", "Flat File Backend", True, False]
+
+        backend = self.ccs.Backend (self.context, info)
+
+        self.assertEqual (backend.Name, "ini")
+        self.assertEqual (backend.ShortDesc, "Ini Backend")
+        self.assertEqual (backend.LongDesc, "Flat File Backend")
+        self.assertEqual (backend.IntegrationSupport, False)
+        self.assertEqual (backend.ProfileSupport, True)
 
 if __name__ == '__main__':
     unittest.main()

=== modified file 'compizconfig/compizconfig-python/tests/test_plugin.py'
--- compizconfig/compizconfig-python/tests/test_plugin.py	2012-10-16 13:53:20 +0000
+++ compizconfig/compizconfig-python/tests/test_plugin.py	2018-09-05 09:24:50 +0000
@@ -4,17 +4,17 @@
 class CompizConfigTestPlugin (compiz_config_test.CompizConfigTest):
 
     def runTest (self):
-	plugin = self.ccs.Plugin (self.context, "mock")
-	plugin.Update ()
+        plugin = self.ccs.Plugin (self.context, "mock")
+        plugin.Update ()
 
-	self.assertEqual (plugin.Context, self.context)
-	self.assertTrue ("A Mock Group" in plugin.Groups)
-	self.assertTrue (plugin.Screen is not None)
-	self.assertEqual (plugin.Name, "mock")
-	self.assertEqual (plugin.ShortDesc, "Mock")
-	self.assertEqual (plugin.LongDesc, "Mock plugin")
-	self.assertEqual (plugin.Category, "Mocks")
-	self.assertEqual (plugin.Features, ["mocking"])
+        self.assertEqual (plugin.Context, self.context)
+        self.assertTrue ("A Mock Group" in plugin.Groups)
+        self.assertTrue (plugin.Screen is not None)
+        self.assertEqual (plugin.Name, "mock")
+        self.assertEqual (plugin.ShortDesc, "Mock")
+        self.assertEqual (plugin.LongDesc, "Mock plugin")
+        self.assertEqual (plugin.Category, "Mocks")
+        self.assertEqual (plugin.Features, ["mocking"])
 
 if __name__ == '__main__':
     unittest.main()

=== modified file 'compizconfig/compizconfig-python/tests/test_setting.py'
--- compizconfig/compizconfig-python/tests/test_setting.py	2012-10-16 13:53:20 +0000
+++ compizconfig/compizconfig-python/tests/test_setting.py	2018-09-05 09:24:50 +0000
@@ -5,21 +5,21 @@
 
     def runTest (self):
 
-	plugin = self.context.Plugins["mock"]
-	setting = self.ccs.Setting (plugin, "mock")
+        plugin = self.context.Plugins["mock"]
+        setting = self.ccs.Setting (plugin, "mock")
 
-	self.assertEqual (setting.Plugin, plugin)
-	self.assertEqual (setting.Name, "mock")
-	self.assertEqual (setting.ShortDesc, "Mock Setting")
-	self.assertEqual (setting.LongDesc, "A Mock Setting")
-	self.assertEqual (setting.Group, "A Mock Group")
-	self.assertEqual (setting.SubGroup, "A Mock Subgroup")
-	self.assertEqual (setting.Type, "String")
-	self.assertEqual (setting.Hints, [])
-	self.assertEqual (setting.DefaultValue, "Mock Value")
-	self.assertEqual (setting.Value, "Mock Value")
-	self.assertEqual (setting.Integrated, False)
-	self.assertEqual (setting.ReadOnly, False)
+        self.assertEqual (setting.Plugin, plugin)
+        self.assertEqual (setting.Name, "mock")
+        self.assertEqual (setting.ShortDesc, "Mock Setting")
+        self.assertEqual (setting.LongDesc, "A Mock Setting")
+        self.assertEqual (setting.Group, "A Mock Group")
+        self.assertEqual (setting.SubGroup, "A Mock Subgroup")
+        self.assertEqual (setting.Type, "String")
+        self.assertEqual (setting.Hints, [])
+        self.assertEqual (setting.DefaultValue, "Mock Value")
+        self.assertEqual (setting.Value, "Mock Value")
+        self.assertEqual (setting.Integrated, False)
+        self.assertEqual (setting.ReadOnly, False)
 
 if __name__ == '__main__':
     unittest.main()

=== modified file 'debian/compizconfig-settings-manager.install'
--- debian/compizconfig-settings-manager.install	2012-06-19 11:22:48 +0000
+++ debian/compizconfig-settings-manager.install	2018-09-05 09:24:50 +0000
@@ -2,6 +2,5 @@
 debian/tmp/usr/share/applications/ccsm.desktop
 debian/tmp/usr/share/icons/hicolor/*/apps/ccsm.*
 debian/tmp/usr/lib/python*/*/ccm*
-debian/tmp/usr/lib/python2.7/dist-packages/ccsm*
+debian/tmp/usr/lib/*/dist-packages/ccsm*
 debian/tmp/usr/share/ccsm
-

=== modified file 'debian/control'
--- debian/control	2018-07-24 10:32:11 +0000
+++ debian/control	2018-09-05 09:24:50 +0000
@@ -7,6 +7,7 @@
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9~),
                dh-migrations,
+               dh-python,
                dh-translations,
                googletest (>= 1.8.0),
                intltool,
@@ -52,12 +53,11 @@
                libx11-xcb-dev,
                libprotobuf-dev,
                protobuf-compiler,
-               python-all-dev,
-               cython,
+               python3-all-dev,
+               cython3,
                gsettings-desktop-schemas-dev,
                xserver-xorg-dev (>= 0.7.0),
 Standards-Version: 3.9.8
-X-Python-Version: >= 2.7
 # If you aren't a member of ~compiz-team but need to upload packaging changes,
 # just go ahead.  ~compiz-team will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~compiz-team/compiz/0.9.10
@@ -148,7 +148,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          compiz-plugins-default (= ${binary:Version}),
          gsettings-desktop-schemas,
          gnome-settings-daemon-schemas (>= 3.4.2-0ubuntu9),
@@ -172,10 +172,10 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          compiz-gnome,
          mate-settings-daemon,
-         python
+         python3
 Recommends: ubuntu-mate-wallpapers-common,
 Description: OpenGL window and compositing manager - MATE integration
  Compiz brings to life a variety of visual effects that make the Linux desktop
@@ -289,13 +289,13 @@
  This package contains the headers and development files needed to
  build plugins with settings support.
 
-Package: python-compizconfig
+Package: python3-compizconfig
 Architecture: any
 Multi-Arch: same
 Section: python
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
-Provides: ${python:Provides}
+Depends: ${misc:Depends}, ${python3:Depends}, ${shlibs:Depends}
+Provides: ${python3:Provides}
 Description: Compizconfig bindings for Python
  Compiz Fusion is the result of the re-unification of the Beryl-project
  and the community around the Compiz Window Manager. It seeks to provide
@@ -308,17 +308,17 @@
 Package: compizconfig-settings-manager
 Architecture: all
 Multi-Arch: allowed
-XB-Python-Version: ${python:Versions}
+XB-Python3-Version: ${python3:Versions}
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         ${python:Depends},
+         ${python3:Depends},
          gir1.2-gdkpixbuf-2.0,
          gir1.2-gtk-3.0,
          gir1.2-pango-1.0,
-         python-compizconfig (>= ${source:Version}),
-         python-gi,
-         python-gi-cairo,
+         python3-compizconfig (>= ${source:Version}),
+         python3-gi,
+         python3-gi-cairo,
 Recommends: compiz-plugins-default
 Description: Compiz configuration settings manager
  The OpenCompositing Project brings 3D desktop visual effects that improve

=== removed file 'debian/python-compizconfig.install'
--- debian/python-compizconfig.install	2014-11-25 19:25:20 +0000
+++ debian/python-compizconfig.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-usr/lib/*/*/compizconfig.*.so
-usr/lib/*/pkgconfig/compizconfig-python.pc
-usr/lib/*/dist-packages/compizconfig_python*

=== removed file 'debian/python-compizconfig.lintian-overrides'
--- debian/python-compizconfig.lintian-overrides	2012-06-19 11:22:48 +0000
+++ debian/python-compizconfig.lintian-overrides	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-python-compizconfig: binary-or-shlib-defines-rpath

=== added file 'debian/python3-compizconfig.install'
--- debian/python3-compizconfig.install	1970-01-01 00:00:00 +0000
+++ debian/python3-compizconfig.install	2018-09-05 09:24:50 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/*/compizconfig.so
+usr/lib/*/dist-packages/compizconfig_python*

=== modified file 'debian/rules'
--- debian/rules	2018-08-28 09:03:07 +0000
+++ debian/rules	2018-09-05 09:24:50 +0000
@@ -5,7 +5,6 @@
 
 include /usr/share/dpkg/architecture.mk
 
-python2_version := $(shell pyversions --requested --version debian/control)
 gles2_architectures := armel armhf
 build_testing := OFF
 
@@ -59,11 +58,6 @@
 	# work around having a file with a conflicted special name (#1156294)
 	cp debian/compizconfig debian/tmp/config
 
-	# accommodate Python's just-gotta-be-different approach to multi-arch
-	python2_dir=debian/tmp/usr/lib/python$(python2_version)/dist-packages; \
-	mv $${python2_dir}/compizconfig.so \
-	   $${python2_dir}/compizconfig.$(DEB_HOST_MULTIARCH).so
-
 	dh_install --fail-missing
 
 	# remove the compizconfig dev file from compiz-dev
@@ -76,5 +70,5 @@
 	dh_auto_test --no-parallel
 
 %:
-	dh $@ --parallel --with python2,migrations,translations
+	dh $@ --parallel --with python3,migrations,translations