noting version requirement for openconnect

[nu-vpn-proxy.git] / gp-saml-gui.py

diff --git a/gp-saml-gui.py b/gp-saml-gui.py
index 2860812237732cebbed4893d2259d38ebf1e4c49..d6f8f15c4bbf2a517b6daf2c3946a18e688c32f5 100755 (executable)
--- a/gp-saml-gui.py
+++ b/gp-saml-gui.py
@@ -1,6 +1,15 @@
 #!/usr/bin/env python3
 
 #!/usr/bin/env python3
 

-import gi
+try:
+    import gi
+except ImportError:
+    try:
+        import pgi as gi
+    except ImportError:
+        gi = None
+if gi is None:
+    raise ImportError("Either gi (PyGObject) or pgi module is required.")
+

 import argparse
 import pprint
 import urllib
 import argparse
 import pprint
 import urllib


@@ -257,7 +266,7 @@ if __name__ == "__main__":
     if args.verbose:
         # Warn about ambiguities
         if server != args.server and not args.uri:
     if args.verbose:
         # Warn about ambiguities
         if server != args.server and not args.uri:

-            print('''IMPORTANT: During the SAML auth, you were redirected from {} to {1}. This probably '''
+            print('''IMPORTANT: During the SAML auth, you were redirected from {0} to {1}. This probably '''

                   '''means you should specify {1} as the server for final connection, but we're not 100% '''
                   '''sure about this. You should probably try both.\n'''.format(args.server, server), file=stderr)
         if ifh != args.interface and not args.uri:
                   '''means you should specify {1} as the server for final connection, but we're not 100% '''
                   '''sure about this. You should probably try both.\n'''.format(args.server, server), file=stderr)
         if ifh != args.interface and not args.uri: