Merge lp:~xnox/ubuntu-terminal-app/drop-lxml-dep into lp:~dpm/ubuntu-terminal-app/merge-plugin

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

Please test. Note that autopilot package still shipps modules in python2 location, instead of python3. I'll make another merge proposal to fix that.

[Nicholas Skaggs (nskaggs)]

review: Approve

[David Planella (dpm)]

Note that it's not a matter of just replacing the import, as it seems that the standard module is not a drop-in replacement for lxml.

So further code changes will be required in CMakePluginParser.py to make it work.

In any case, as discussed on IRC with balloons, I'll split the original MP to isolate this change and not block on it.

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

On 6 May 2014 19:46, David Planella <email address hidden> wrote:
> Review: Needs Fixing
>
> Note that it's not a matter of just replacing the import, as it seems that the standard module is not a drop-in replacement for lxml.
>
> So further code changes will be required in CMakePluginParser.py to make it work.
>
> In any case, as discussed on IRC with balloons, I'll split the original MP to isolate this change and not block on it.

Yeah, well i've run the tests on the desktop and they all passed....
not sure if CMakePluginParser was actually in fact used or not.

--
Regards,

Dimitri.

Unmerged revisions

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 17:44:27 +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 17:44:27 +0000
@@ -45,7 +45,6 @@
 Depends: ${misc:Depends},
          libautopilot-qt,
          libqt5test5,
-         python3-lxml,
          ubuntu-terminal-app (>= ${source:Version}),
          ubuntu-ui-toolkit-autopilot,
 Description: Autopilot tests for Terminal Application
 
=== 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 17:44:27 +0000
@@ -23,7 +23,7 @@
 """
 
 import sys
-from lxml import etree
+import xml.etree.ElementTree as etree
 
 
 class CMakePluginParseError(Exception):