diff -Nru xdiagnose-3.7.2/bin/dpkg-log-summary xdiagnose-3.8~ppa1/bin/dpkg-log-summary
--- xdiagnose-3.7.2/bin/dpkg-log-summary	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/bin/dpkg-log-summary	2015-04-13 11:02:27.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 import os
 import sys
diff -Nru xdiagnose-3.7.2/bin/xdiagnose xdiagnose-3.8~ppa1/bin/xdiagnose
--- xdiagnose-3.7.2/bin/xdiagnose	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/bin/xdiagnose	2015-04-13 11:02:32.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import sys
 import logging
diff -Nru xdiagnose-3.7.2/bin/xedid xdiagnose-3.8~ppa1/bin/xedid
--- xdiagnose-3.7.2/bin/xedid	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/bin/xedid	2015-04-13 11:02:36.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 import os
 import sys
diff -Nru xdiagnose-3.7.2/bin/xpci xdiagnose-3.8~ppa1/bin/xpci
--- xdiagnose-3.7.2/bin/xpci	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/bin/xpci	2015-04-13 11:02:39.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 import sys
 
diff -Nru xdiagnose-3.7.2/bin/xrandr-tool xdiagnose-3.8~ppa1/bin/xrandr-tool
--- xdiagnose-3.7.2/bin/xrandr-tool	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/bin/xrandr-tool	2015-04-13 11:02:42.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 import os
 import sys
diff -Nru xdiagnose-3.7.2/data/failsafeXinit xdiagnose-3.8~ppa1/data/failsafeXinit
--- xdiagnose-3.7.2/data/failsafeXinit	2014-12-15 13:57:14.000000000 +0100
+++ xdiagnose-3.8~ppa1/data/failsafeXinit	2015-04-13 11:01:15.000000000 +0200
@@ -98,7 +98,7 @@
 display_filebug_menu() {
     # Run apport to file a bug
     if [ -e $apport_hook ]; then
-        python $apport_hook
+        python3 $apport_hook
         if [ $? == 0 ]; then
             zenity --info --text "$(gettext 'A bug report has been written.\nYou can send it next time you log in.')"
         else
diff -Nru xdiagnose-3.7.2/debian/changelog xdiagnose-3.8~ppa1/debian/changelog
--- xdiagnose-3.7.2/debian/changelog	2015-04-09 10:45:32.000000000 +0200
+++ xdiagnose-3.8~ppa1/debian/changelog	2015-04-13 11:03:48.000000000 +0200
@@ -1,3 +1,9 @@
+xdiagnose (3.8) UNRELEASED; urgency=medium
+
+  * Port and ensure scripts are running with python3 (LP: #1440564)
+
+ -- Didier Roche <didrocks@ubuntu.com>  Mon, 13 Apr 2015 11:03:10 +0200
+
 xdiagnose (3.7.2) vivid; urgency=medium
 
   * Only fallback to xdiagnose on systemd if an installed default display
diff -Nru xdiagnose-3.7.2/debian/rules xdiagnose-3.8~ppa1/debian/rules
--- xdiagnose-3.7.2/debian/rules	2014-12-15 14:26:51.000000000 +0100
+++ xdiagnose-3.8~ppa1/debian/rules	2015-04-13 11:52:24.000000000 +0200
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with python2,python3,systemd,translations --buildsystem python_distutils
+	dh "$@" --with python3,systemd,translations --buildsystem python_distutils
 
 override_dh_auto_clean:
 	dh_auto_clean
diff -Nru xdiagnose-3.7.2/tests/test_xorglog_parser xdiagnose-3.8~ppa1/tests/test_xorglog_parser
--- xdiagnose-3.7.2/tests/test_xorglog_parser	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/tests/test_xorglog_parser	2015-04-13 11:01:06.000000000 +0200
@@ -5,7 +5,7 @@
 echo "# Testing log parser..."
 
 for logfile in tests/sample.Xorg.*.log; do
-    lines=$(python xdiagnose/xorglog.py ${logfile})
+    lines=$(python3 xdiagnose/xorglog.py ${logfile})
     if [ $? -ne 0 ]; then
 	fail "${logfile}: error code non-zero"
     else
diff -Nru xdiagnose-3.7.2/xdiagnose/application.py xdiagnose-3.8~ppa1/xdiagnose/application.py
--- xdiagnose-3.7.2/xdiagnose/application.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/application.py	2015-04-13 10:56:22.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import gtk
 
 class Application(object):
diff -Nru xdiagnose-3.7.2/xdiagnose/config_update.py xdiagnose-3.8~ppa1/xdiagnose/config_update.py
--- xdiagnose-3.7.2/xdiagnose/config_update.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/config_update.py	2015-04-13 10:56:33.000000000 +0200
@@ -36,8 +36,6 @@
 PARAMETER_FIFTH=42
 '''
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 import os
 import sys
diff -Nru xdiagnose-3.7.2/xdiagnose/diagnostics.py xdiagnose-3.8~ppa1/xdiagnose/diagnostics.py
--- xdiagnose-3.7.2/xdiagnose/diagnostics.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/diagnostics.py	2015-04-13 10:56:43.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 class Diagnostic:
     def __init__(self):
         self.name = None
diff -Nru xdiagnose-3.7.2/xdiagnose/edid.py xdiagnose-3.8~ppa1/xdiagnose/edid.py
--- xdiagnose-3.7.2/xdiagnose/edid.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/edid.py	2015-04-13 10:59:12.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import sys
 import os
 import re
diff -Nru xdiagnose-3.7.2/xdiagnose/errors_treeview.py xdiagnose-3.8~ppa1/xdiagnose/errors_treeview.py
--- xdiagnose-3.7.2/xdiagnose/errors_treeview.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/errors_treeview.py	2015-04-13 10:56:57.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 # example basictreeview.py
 
 from gi.repository import Gtk
diff -Nru xdiagnose-3.7.2/xdiagnose/pci_devices.py xdiagnose-3.8~ppa1/xdiagnose/pci_devices.py
--- xdiagnose-3.7.2/xdiagnose/pci_devices.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/pci_devices.py	2015-04-13 10:57:07.000000000 +0200
@@ -23,8 +23,6 @@
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 
 class PciDevice(object):
diff -Nru xdiagnose-3.7.2/xdiagnose/welcome.py xdiagnose-3.8~ppa1/xdiagnose/welcome.py
--- xdiagnose-3.7.2/xdiagnose/welcome.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/welcome.py	2015-04-13 10:57:17.000000000 +0200
@@ -22,8 +22,6 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import os
 from gi.repository import Gtk
 import shutil
diff -Nru xdiagnose-3.7.2/xdiagnose/xorglog.py xdiagnose-3.8~ppa1/xdiagnose/xorglog.py
--- xdiagnose-3.7.2/xdiagnose/xorglog.py	2013-09-02 09:39:47.000000000 +0200
+++ xdiagnose-3.8~ppa1/xdiagnose/xorglog.py	2015-04-13 10:57:26.000000000 +0200
@@ -37,8 +37,6 @@
 #
 #========================================================================
 
-from __future__ import absolute_import, print_function, unicode_literals
-
 import re
 
 class XorgLog(object):