Merge lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3 into lp:~dpm/ubuntu-terminal-app/merge-plugin

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

install autopilot tests into python3 path.

[lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3]

73. By Dimitri John Ledkov on 2014-05-06

Add python3 build-dep.

[David Planella (dpm)]

Rejected as part of cleaning up MPs for Terminal. We discussed the changes on this branch a while ago (I can't find the comments, though), and the issue is that replacing the Python import without replacing the code that processes the XML won't work.

review: Disapprove

[Dimitri John Ledkov (xnox)]

Apart from "didn't work" comment no other comments were provided neither at
the time, not now. Fully works here for me. What's wrong?
On 12 Aug 2014 15:41, "David Planella" <email address hidden> wrote:

> Review: Disapprove
>
> Rejected as part of cleaning up MPs for Terminal. We discussed the changes
> on this branch a while ago (I can't find the comments, though), and the
> issue is that replacing the Python import without replacing the code that
> processes the XML won't work.
> --
>
> https://code.launchpad.net/~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3/+merge/218483
> You are the owner of lp:~xnox/ubuntu-terminal-app/merge-plugin+lxml+py3.
>

Unmerged revisions

73. By Dimitri John Ledkov on 2014-05-06

Add python3 build-dep.

72. By Dimitri John Ledkov on 2014-05-06

Install autopilot tests into python3 path.

71. By Dimitri John Ledkov on 2014-05-06

Drop lxml dependency

=== modified file 'README.md'
--- README.md	2014-05-06 15:07:24 +0000
+++ README.md	2014-05-06 18:32:06 +0000
@@ -150,9 +150,3 @@
 
     cd tests/autopilot
     autopilot run ubuntu_terminal_app
-
-To run the tests on a device, the python3-lxml lib needs to be manually copied
-to /home/phablet/autopilot. Note that the armhf version is required, as it's a
-compiled module. This manual step is only temporary until the
-phablet-click-test-setup gains the capability of automatically doing this
-setup.
 
=== modified file 'debian/control'
--- debian/control	2014-05-06 15:07:24 +0000
+++ debian/control	2014-05-06 18:32:06 +0000
@@ -3,7 +3,7 @@
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               python,
+               python3,
                gettext,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -45,7 +45,7 @@
 Depends: ${misc:Depends},
          libautopilot-qt,
          libqt5test5,
-         python3-lxml,
+	 python3-autopilot,
          ubuntu-terminal-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
 Description: Autopilot tests for Terminal Application
 
=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-02-04 16:10:39 +0000
+++ tests/autopilot/CMakeLists.txt	2014-05-06 18:32:06 +0000
@@ -1,5 +1,5 @@
 if(INSTALL_TESTS)
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(DIRECTORY ${AUTOPILOT_DIR}
 
=== modified file 'tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py'
--- tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py	2014-04-28 06:06:48 +0000
+++ tests/autopilot/ubuntu_terminal_app/CMakePluginParser.py	2014-05-06 18:32:06 +0000
@@ -23,7 +23,7 @@
 """
 
 import sys
-from lxml import etree
+import xml.etree.ElementTree as etree
 
 
 class CMakePluginParseError(Exception):