patches/gtk2/gtk-builder-convert-Remove-compat-code-for-Python-2.3-and.patch

   1 From: Petr Viktorin <encukou@gmail.com>
   2 Date: Tue, 3 Sep 2019 14:53:05 +0200
   3 Subject: gtk-builder-convert: Remove compat code for Python 2.3 and below
   4
   5 Origin: upstream, 2.24.33, commit:4f8efe3ae09ee69657b83399a118b5252f25d830
   6 ---
   7  gtk/gtk-builder-convert | 13 +------------
   8  1 file changed, 1 insertion(+), 12 deletions(-)
   9
  10 diff --git a/gtk/gtk-builder-convert b/gtk/gtk-builder-convert
  11 index 41f7a8c..a16f83b 100755
  12 --- a/gtk/gtk-builder-convert
  13 +++ b/gtk/gtk-builder-convert
  14 @@ -48,12 +48,7 @@ DIALOGS = ['GtkDialog',
  15             'GtkMessageDialog']
  16  WINDOWS = ['GtkWindow'] + DIALOGS
  17
  18 -# The subprocess is only available in Python 2.4+
  19 -try:
  20 -    import subprocess
  21 -    subprocess # pyflakes
  22 -except ImportError:
  23 -    subprocess = None
  24 +import subprocess
  25
  26  def get_child_nodes(node):
  27      assert node.tagName == 'object'
  28 @@ -271,12 +266,6 @@ class GtkBuilderConverter(object):
  29          for node in self._dom.getElementsByTagName("accessibility"):
  30              self._convert_accessibility(node)
  31
  32 -        # Output the newly created root objects and sort them
  33 -        # by attribute id
  34 -        # FIXME: Use sorted(self.root_objects,
  35 -        #                   key=lambda n: n.getAttribute('id'),
  36 -        #                   reverse=True):
  37 -        # when we can depend on python 2.4 or higher
  38          root_objects = self.root_objects[:]
  39          root_objects.sort(key=lambda a: a.getAttribute('id'), reverse=True)
  40          for obj in root_objects: