Provide a fallback to old IPython named config option...

... as suggested by @bgruening in #3294 (review).
galaxyproject · Dec 16, 2016 · a473c07 · a473c07
1 parent 7468ea3
commit a473c07
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/galaxy/config.py b/lib/galaxy/config.py
@@ -276,7 +276,11 @@ def __init__( self, **kwargs ):
         self.sanitize_whitelist_file = resolve_path( kwargs.get( 'sanitize_whitelist_file', "config/sanitize_whitelist.txt" ), self.root )
         self.serve_xss_vulnerable_mimetypes = string_as_bool( kwargs.get( 'serve_xss_vulnerable_mimetypes', False ) )
         self.allowed_origin_hostnames = self._parse_allowed_origin_hostnames( kwargs )
-        self.trust_jupyter_notebook_conversion = string_as_bool( kwargs.get( 'trust_jupyter_notebook_conversion', False ) )
+        if "trust_jupyter_notebook_conversion" in kwargs:
+            trust_jupyter_notebook_conversion = string_as_bool( kwargs.get( 'trust_jupyter_notebook_conversion', False ) )
+        else:
+            trust_jupyter_notebook_conversion = string_as_bool( kwargs.get( 'trust_ipython_notebook_conversion', False ) )
+        self.trust_jupyter_notebook_conversion = trust_jupyter_notebook_conversion
         self.enable_old_display_applications = string_as_bool( kwargs.get( "enable_old_display_applications", "True" ) )
         self.brand = kwargs.get( 'brand', None )
         self.welcome_url = kwargs.get( 'welcome_url', '/static/welcome.html' )