Merge the changes introduced in PR #247

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6242 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: rasmunk

mig/shared/functionality/reqjupyterservice.py

@@ -52,10 +52,14 @@
 import time
 import shutil
 import random
-import requests
+try:
+    import requests
+except ImportError as err:
+    requests = None
 
 from mig.shared import returnvalues
 from mig.shared.base import client_id_dir, extract_field
+from mig.shared.conf import get_configuration_object
 from mig.shared.defaults import session_id_bytes
 from mig.shared.fileio import make_symlink, pickle, unpickle, write_file, \
     delete_symlink, delete_file
@@ -68,6 +72,18 @@
     get_workflow_session_id
 
 
+def __bail_out_requests(*args, **kwargs):
+    """Helper for dynamic bail out on actual use"""
+    raise Exception("jupyter functions require requests")
+
+
+def __require_requests(func):
+    """Internal helper to verify requests module availability on use"""
+    if requests is None:
+        return __bail_out_requests
+    return func
+
+
 def is_active(pickle_state, timeout=7200):
     """
     :param pickle_state: expects a pickle object dictionary that
@@ -212,7 +228,7 @@ def get_newest_mount(jupyter_mounts):
             old_mounts.append(mount)
     return latest, old_mounts
 
-
+@__require_requests
 def get_host_from_service(configuration, service, base_url=None):
     """
     Returns a URL from one of the services available hosts,
@@ -318,7 +334,7 @@ def signature():
     }
     return ['', defaults]
 
-
+@__require_requests
 def main(client_id, user_arguments_dict):
     """Main function used by front end"""
     (configuration, logger, output_objects, op_name) = \
@@ -350,12 +366,7 @@ def main(client_id, user_arguments_dict):
             {'object_type': 'error_text', 'text':
              'The required sftp service is not enabled on the system'})
         return (output_objects, returnvalues.SYSTEM_ERROR)
-
-    if configuration.site_enable_sftp:
-        sftp_port = configuration.user_sftp_port
-
-    if configuration.site_enable_sftp_subsys:
-        sftp_port = configuration.user_sftp_subsys_port
+    sftp_port = configuration.user_sftp_show_port
 
     requested_service = accepted['service'][-1]
     service = {k: v for options in configuration.jupyter_services
@@ -653,7 +664,6 @@ def main(client_id, user_arguments_dict):
 
 
 if __name__ == "__main__":
-    from mig.shared.conf import get_configuration_object
     if not os.environ.get('MIG_CONF', ''):
         conf_path = os.path.join(os.path.dirname(sys.argv[0]),
                                  '..', '..', 'server', 'MiGserver.conf')