]> git.ipfire.org Git - thirdparty/hostap.git/commitdiff
tests: python3 compatible way of importing gobject for D-Bus testing
authorJouni Malinen <j@w1.fi>
Sun, 3 Feb 2019 15:16:28 +0000 (17:16 +0200)
committerJouni Malinen <j@w1.fi>
Mon, 4 Feb 2019 10:26:34 +0000 (12:26 +0200)
Signed-off-by: Jouni Malinen <j@w1.fi>
tests/hwsim/test_dbus.py
tests/hwsim/test_dbus_old.py

index 338c1dd90dfc2b9118484898e7e69484535a8cc0..0e690fab32df8c0e1d3680ade49b2146820f1df1 100644 (file)
@@ -9,9 +9,13 @@ import logging
 logger = logging.getLogger()
 import subprocess
 import time
+import sys
 
 try:
-    import gobject
+    if sys.version_info[0] > 2:
+        from gi.repository import GObject as gobject
+    else:
+        import gobject
     import dbus
     dbus_imported = True
 except ImportError:
index bb6043e7eeff0fc2b2d8333825eeafd35d9a70c8..4e132a0d4f35aafc2a8d7030fa5881ed5c50c9c5 100644 (file)
@@ -6,9 +6,13 @@
 
 import logging
 logger = logging.getLogger()
+import sys
 
 try:
-    import gobject
+    if sys.version_info[0] > 2:
+        from gi.repository import GObject as gobject
+    else:
+        import gobject
     import dbus
     dbus_imported = True
 except ImportError: