bin: Enforce versions with gi.require_version in python3 scripts

Fixes lp:1552609 

12 files changed, 33 insertions, 4 deletions

diff --git a/bin/accelerometer_test b/bin/accelerometer_test
index 93130fc..2d95ca8 100755
--- a/bin/accelerometer_test
+++ b/bin/accelerometer_test
@@ -24,13 +24,17 @@ accelerometer, and check to be sure that the x, y, z axis respond
 to physical movement of hardware.
 '''
 from argparse import ArgumentParser
-from gi.repository import Gdk, GLib, Gtk
+import gi
 import logging
 import os
 import re
 import sys
 import threading
 import time
+gi.require_version('Gdk', '3.0')
+gi.require_version('GLib', '2.0')
+gi.require_version("Gtk", "3.0")
+from gi.repository import Gdk, GLib, Gtk
 from subprocess import Popen, PIPE, check_output, STDOUT, CalledProcessError
 from checkbox_support.parsers.modinfo import ModinfoParser
 
diff --git a/bin/audio_test b/bin/audio_test
index f0b73a4..466b760 100755
--- a/bin/audio_test
+++ b/bin/audio_test
@@ -12,6 +12,7 @@ import sys
 import time
 try:
 import gi
+ gi.require_version('GLib', '2.0')
 gi.require_version('Gst','1.0')
 from gi.repository import GObject
 from gi.repository import Gst
diff --git a/bin/battery_test b/bin/battery_test
index cdfd227..b2682c7 100755
--- a/bin/battery_test
+++ b/bin/battery_test
@@ -1,11 +1,13 @@
 #!/usr/bin/env python3
 
+import gi
 import os
 import time
 import re
 import subprocess
 import sys
 import argparse
+gi.require_version('Gio', '2.0')
 from gi.repository import Gio
 
 
diff --git a/bin/gpu_test b/bin/gpu_test
index bd22acc..49ea31a 100755
--- a/bin/gpu_test
+++ b/bin/gpu_test
@@ -23,11 +23,13 @@ lockups.
 Inspired by the workload directory of the xdiagnose package.
 """
 
+import gi
 import os
 import re
 import subprocess
 import sys
 import time
+gi.require_version('Gio', '2.0')
 from gi.repository import Gio
 from math import cos, sin
 from threading import Thread
diff --git a/bin/gst_pipeline_test b/bin/gst_pipeline_test
index cde7fbb..4d9f3c4 100755
--- a/bin/gst_pipeline_test
+++ b/bin/gst_pipeline_test
@@ -1,11 +1,14 @@
 #!/usr/bin/env python3
 
 from argparse import ArgumentParser
+import gi
 import logging
 import re
 import os
 import sys
 import time
+gi.require_version('Gst', '1.0')
+gi.require_version('GLib', '2.0')
 from gi.repository import Gst
 from gi.repository import GLib
 from subprocess import check_output
diff --git a/bin/key_test b/bin/key_test
index 3cf7ae0..2bd95f9 100755
--- a/bin/key_test
+++ b/bin/key_test
@@ -18,6 +18,7 @@
 # along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 
 
+import gi
 import os
 import sys
 
@@ -27,6 +28,7 @@ import struct
 import termios
 
 from gettext import gettext as _
+
 from gi.repository import GObject
 from optparse import OptionParser
 
@@ -221,6 +223,8 @@ class GtkReporter(Reporter):
 def __init__(self, *args, **kwargs):
 super(GtkReporter, self).__init__(*args, **kwargs)
 
+ gi.require_version('Gdk', '3.0')
+ gi.require_version("Gtk", "3.0")
 from gi.repository import Gdk, Gtk
 
 # Initialize GTK constants
diff --git a/bin/keyboard_test b/bin/keyboard_test
index 309b845..3e198db 100755
--- a/bin/keyboard_test
+++ b/bin/keyboard_test
@@ -33,8 +33,10 @@ def cli_prompt():
 
 
 def gtk_prompt():
+ import gi
 from gi.repository import Gtk, Gdk
-
+ gi.require_version('Gdk', '3.0')
+ gi.require_version("Gtk", "3.0")
 # create a new window
 window = Gtk.Window()
 window.set_type_hint(Gdk.WindowType.TOPLEVEL)
diff --git a/bin/lock_screen_watcher b/bin/lock_screen_watcher
index 4e9847e..1c30270 100755
--- a/bin/lock_screen_watcher
+++ b/bin/lock_screen_watcher
@@ -17,7 +17,9 @@
 # along with Checkbox. If not, see <http://www.gnu.org/licenses/>.
 
 import dbus
+import gi
 from dbus.mainloop.glib import DBusGMainLoop
+gi.require_version('GLib', '2.0')
 from gi.repository import GObject
 from gi.repository import GLib
 
diff --git a/bin/network_restart b/bin/network_restart
index 31f1da7..d01e983 100755
--- a/bin/network_restart
+++ b/bin/network_restart
@@ -14,6 +14,9 @@ from subprocess import check_output, check_call, CalledProcessError, STDOUT
 from argparse import ArgumentParser
 
 try:
+ import gi
+ gi.require_version('GLib', '2.0')
+ gi.require_version("Gtk", "3.0")
 from gi.repository import Gtk, GObject, GLib
 GLib.threads_init()
 GObject.threads_init()
diff --git a/bin/pm_test b/bin/pm_test
index bf4f436..a5cd024 100755
--- a/bin/pm_test
+++ b/bin/pm_test
@@ -1,4 +1,5 @@
 #!/usr/bin/env python3
+import gi
 import logging
 import logging.handlers
 import os
@@ -13,7 +14,7 @@ from calendar import timegm
 from configparser import ConfigParser
 from datetime import datetime, timedelta
 from time import localtime, time
-
+gi.require_version("Gtk", "3.0")
 from gi.repository import GObject, Gtk
 
 
diff --git a/bin/resolution_test b/bin/resolution_test
index a50868b..55a7828 100755
--- a/bin/resolution_test
+++ b/bin/resolution_test
@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
+import gi
 import sys
 
 from argparse import ArgumentParser
-
+gi.require_version('Gdk', '3.0')
 from gi.repository import Gdk
 
 
diff --git a/bin/touchpad_test b/bin/touchpad_test
index 7152745..bc6a474 100755
--- a/bin/touchpad_test
+++ b/bin/touchpad_test
@@ -1,9 +1,13 @@
 #!/usr/bin/env python3
 
+import gi
 import sys
 import gettext
 
 from gettext import gettext as _
+gi.require_version('Gdk', '3.0')
+gi.require_version('Gio', '2.0')
+gi.require_version("Gtk", "3.0")
 from gi.repository import Gio, Gtk, Gdk
 from optparse import OptionParser