Merge lp:~laney/ubuntu-release-upgrader/lp1548858 into lp:ubuntu-release-upgrader

[Iain Lane]

Add back the old code for Vte 2.90 and WebKit 1 - u-r-u needs to remain compatible with 14.04

Add back the old code for Vte 2.90 and WebKit 1 - u-r-u needs to remain compatible with 14.04

[Brian Murray (brian-murray)]

I tested an upgrade from Trusty to Xenial and while it exploded, I was still able to see ubuntu-release-upgrader dialogs about the situation so the bug seems fixed.

=== modified file 'DistUpgrade/DistUpgradeViewGtk3.py'
--- DistUpgrade/DistUpgradeViewGtk3.py	2016-02-16 14:46:49 +0000
+++ DistUpgrade/DistUpgradeViewGtk3.py	2016-02-23 17:51:48 +0000
@@ -20,9 +20,19 @@
 #  USA
 
 import gi
-gi.require_version("Vte", "2.91")
-from gi.repository import Vte
-gi.require_version("Gtk", "3.0")
+
+vte291 = False
+try:
+    gi.require_version("Vte", "2.91")
+    from gi.repository import Vte
+    vte291 = True
+except Exception as e:
+    gi.require_version("Vte", "2.90")
+    # COMPAT: Dear upstream, this compat code below will be duplicated in
+    #         all python-vte using applications. Love, Michael
+    from gi.repository import Vte
+    Vte.Pty.new_sync = Vte.Pty.new
+
 from gi.repository import Gtk
 from gi.repository import Gdk
 from gi.repository import GLib
@@ -356,26 +366,21 @@
         self.term = term
         self.parent = parent
     def call(self, cmd, hidden=False):
-        def wait_for_child(terminal, status):
-            #print("wait for child finished")
-            self.finished=True
+        if vte291:
+            def wait_for_child(terminal, status):
+                #print("wait for child finished")
+                self.finished=True
+        else:
+            def wait_for_child(widget):
+                #print("wait for child finished")
+                self.finished=True
         self.term.show()
         self.term.connect("child-exited", wait_for_child)
         self.parent.expander_terminal.set_sensitive(True)
         if hidden==False:
             self.parent.expander_terminal.set_expanded(True)
         self.finished = False
-        if hasattr(self.term, "fork_command_full"):
-            (success, pid) = self.term.fork_command_full(
-                Vte.PtyFlags.DEFAULT,
-                "/",
-                cmd,
-                None,
-                0,     # GLib.SpawnFlags
-                None,  # child_setup
-                None,  # child_setup_data
-                )
-        elif hasattr(self.term, "spawn_sync"):
+        if vte291:
             (success, pid) = self.term.spawn_sync(
                 Vte.PtyFlags.DEFAULT,
                 "/",
@@ -386,6 +391,16 @@
                 None,  # child_setup_data
                 None,  # GCancellable
                 )
+        else:
+            (success, pid) = self.term.fork_command_full(
+                Vte.PtyFlags.DEFAULT,
+                "/",
+                cmd,
+                None,
+                0,     # GLib.SpawnFlags
+                None,  # child_setup
+                None,  # child_setup_data
+                )
         if not success or pid < 0:
             # error
             return
@@ -402,12 +417,20 @@
     def open(self, url):
         if not self._webkit_view:
             return
-        self._webkit_view.load_uri(url)
-        self._webkit_view.connect("load-changed", self._on_load_changed)
+        try:
+            from gi.repository import WebKit2
+            assert WebKit2 # silence pep8
+            self._webkit_view.load_uri(url)
+            self._webkit_view.connect("load-changed", self._on_load_changed)
+        except ImportError:
+            self._webkit_view.open(url)
+            self._webkit_view.connect("load-finished", self._on_load_finished)
     def show(self):
         self._webkit_view.show()
     def hide(self):
         self._webkit_view.hide()
+    def _on_load_finished(self, view, frame):
+        view.show()
     def _on_load_changed(self, view, event, data):
         from gi.repository import WebKit2
         if event == WebKit2.LoadEvent.LOAD_FINISHED:
@@ -513,8 +536,11 @@
     def getHtmlView(self):
         if self._webkit_view is None:
             try:
-                from gi.repository import WebKit2
-                self._webkit_view = WebKit2.WebView()
+                try:
+                    from gi.repository import WebKit2 as WebKit
+                except ImportError:
+                    from gi.repository import WebKit
+                self._webkit_view = WebKit.WebView()
                 settings = self._webkit_view.get_settings()
                 settings.set_property("enable-plugins", False)
                 self.vbox_main.pack_end(self._webkit_view, True, True, 0)

=== modified file 'DistUpgrade/ReleaseNotesViewerWebkit.py'
--- DistUpgrade/ReleaseNotesViewerWebkit.py	2016-02-16 14:46:49 +0000
+++ DistUpgrade/ReleaseNotesViewerWebkit.py	2016-02-23 17:51:48 +0000
@@ -24,26 +24,42 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 #  USA
 
+from .ReleaseNotesViewer import open_url
+
 from gi.repository import Gtk
-from gi.repository import WebKit2
-
-from .ReleaseNotesViewer import open_url
-
-
-class ReleaseNotesViewerWebkit(WebKit2.WebView):
+
+webkit2 = False
+try:
+    from gi.repository import WebKit2 as WebKit
+    webkit2 = True
+except ImportError:
+    from gi.repository import WebKit
+
+
+class ReleaseNotesViewerWebkit(WebKit.WebView):
     def __init__(self, notes_url):
         super(ReleaseNotesViewerWebkit, self).__init__()
         self.load_uri(notes_url)
-        self.connect("decide-policy",
-                     self._on_decide_policy)
+        if webkit2:
+            self.connect("decide-policy",
+                         self._on_decide_policy)
+        else:
+            self.connect("navigation-policy-decision-requested",
+                         self._on_navigation_policy_decision_requested)
+
+        def _on_navigation_policy_decision_requested(self, view, frame,
+                                                     request, action, policy):
+            open_url(request.get_uri())
+            policy.ignore()
+            return True
 
     def _on_decide_policy(self, web_view, decision, decision_type):
-        if decision_type == WebKit2.PolicyDecisionType.NAVIGATION_ACTION:
+        if decision_type == WebKit.PolicyDecisionType.NAVIGATION_ACTION:
             navigation_action = decision.get_navigation_action()
             navigation_request = navigation_action.get_request()
             navigation_type = navigation_action.get_navigation_type()
 
-            if navigation_type == WebKit2.NavigationType.LINK_CLICKED:
+            if navigation_type == WebKit.NavigationType.LINK_CLICKED:
                 uri = navigation_request.get_uri()
                 open_url(uri)
                 decision.ignore()

=== modified file 'debian/changelog'
--- debian/changelog	2016-02-16 15:09:41 +0000
+++ debian/changelog	2016-02-23 17:51:48 +0000
@@ -1,3 +1,10 @@
+ubuntu-release-upgrader (1:16.04.7) UNRELEASED; urgency=medium
+
+  * Keep fallback compatibility with Vte 2.90 and WebKit 1, required to run on
+    14.04 (LP: #1548858)
+
+ -- Iain Lane <[e-mail]>  Tue, 23 Feb 2016 16:23:34 +0000
+
 ubuntu-release-upgrader (1:16.04.6) xenial; urgency=medium
 
   * utils/demotions.py: Set Apt::Architectures too so that the host's

=== modified file 'debian/control'
--- debian/control	2016-02-16 14:46:49 +0000
+++ debian/control	2016-02-23 17:51:48 +0000
@@ -56,9 +56,9 @@
          python3-distupgrade (= ${source:Version}),
          python3-dbus,
          python3-gi (>= 3.8),
-         gir1.2-vte-2.91,
+         gir1.2-vte-2.91 | gir1.2-vte-2.90,
          gir1.2-gtk-3.0,
-         gir1.2-webkit2-4.0
+         gir1.2-webkit2-4.0 | gir1.2-webkit-3.0
 Description: manage release upgrades
  This is the GTK+ frontend of the Ubuntu Release Upgrader