Merge pull request #8536 from ic4f/dev_misc_fix3

Fix/cleanup a few minor things

doc/source/admin/galaxy_options.rst

@@ -1248,12 +1248,12 @@
 :Type: bool
 
 
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ``interactivetools_enable``
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 :Description:
-    Set this to true to enable InteractiveTools.
+    Enable InteractiveTools.
 :Default: ``false``
 :Type: bool
 

lib/galaxy/config/sample/galaxy.yml.sample

@@ -101,13 +101,13 @@ galaxy:
   # The directory that will be prepended to relative paths in options
   # specifying other Galaxy config files (e.g. datatypes_config_file).
   # Defaults to the directory in which galaxy.yml is located.
-  #config_dir: false
+  #config_dir: 'false'
 
   # The directory that will be prepended to relative paths in options
   # specifying Galaxy data/cache directories and files (such as the
   # default SQLite database, file_path, etc.). Defaults to `database/`
   # if running Galaxy from source or `<config_dir>/data` otherwise.
-  #data_dir: false
+  #data_dir: 'false'
 
   # By default, Galaxy uses a SQLite database at
   # 'database/universe.sqlite'.  You may use a SQLAlchemy connection
@@ -428,9 +428,6 @@ galaxy:
   # scenarios than the watchdog default.
   #watch_tool_data_dir: 'false'
 
-  # Enable InteractiveTools by setting to true
-  #interactivetools_enable: false
-
   # File containing old-style genome builds
   #builds_file_path: tool-data/shared/ucsc/builds.txt
 
@@ -676,6 +673,9 @@ galaxy:
   # third-party server, tricking a Galaxy user to access said site.
   #enable_old_display_applications: true
 
+  # Enable InteractiveTools.
+  #interactivetools_enable: false
+
   # Show visualization tab and list in masthead.
   #visualizations_visible: true
 

lib/galaxy/util/watcher.py

@@ -143,7 +143,7 @@ class EventHandler(FileSystemEventHandler):
         # look at dest if it exists else use src.
         path = getattr(event, 'dest_path', None) or event.src_path
         path = os.path.abspath(path)
-        callback = self.watcher.file_callbacks.get(path, None)
+        callback = self.watcher.file_callbacks.get(path)
         if os.path.basename(path).startswith('.'):
             return
         if callback:

lib/galaxy/webapps/galaxy/config_schema.yml

@@ -28,7 +28,7 @@ mapping:
 
       config_dir:
         type: str
-        default: false
+        default: 'false'
         required: false
         desc: |
           The directory that will be prepended to relative paths in options specifying
@@ -37,7 +37,7 @@ mapping:
 
       data_dir:
         type: str
-        default: false
+        default: 'false'
         required: false
         desc: |
           The directory that will be prepended to relative paths in options specifying