Cleaning up FIXMEs

lib/ansible/plugins/__init__.py

@@ -232,13 +232,12 @@ class PluginLoader:
             # they can have any suffix
             suffix = ''
 
-        ### FIXME:
-        # Instead of using the self._paths cache (PATH_CACHE) and
-        # self._searched_paths we could use an iterator.  Before enabling that
-        # we need to make sure we don't want to add additional directories
-        # (add_directory()) once we start using the iterator.  Currently, it
-        # looks like _get_paths() never forces a cache refresh so if we expect
-        # additional directories to be added later, it is buggy.
+        # TODO: Instead of using the self._paths cache (PATH_CACHE) and
+        #       self._searched_paths we could use an iterator.  Before enabling that
+        #       we need to make sure we don't want to add additional directories
+        #       (add_directory()) once we start using the iterator.  Currently, it
+        #       looks like _get_paths() never forces a cache refresh so if we expect
+        #       additional directories to be added later, it is buggy.
         for path in (p for p in self._get_paths() if p not in self._searched_paths and os.path.isdir(p)):
             try:
                 full_paths = (os.path.join(path, f) for f in os.listdir(path))

lib/ansible/plugins/action/__init__.py

@@ -88,12 +88,10 @@ class ActionBase:
             module_path = self._shared_loader_obj.module_loader.find_plugin(module_name, mod_type)
             if module_path:
                 break
-        else: # This is a for-else: http://bit.ly/1ElPkyg
-            # FIXME: Why is it necessary to look for the windows version?
-            # Shouldn't all modules be installed?
-            #
+        else:
             # Use Windows version of ping module to check module paths when
-            # using a connection that supports .ps1 suffixes.
+            # using a connection that supports .ps1 suffixes. We check specifically
+            # for win_ping here, otherwise the code would look for ping.ps1
             if '.ps1' in self._connection.module_implementation_preferences:
                 ping_module = 'win_ping'
             else:
@@ -138,8 +136,6 @@ class ActionBase:
         Determines if a temp path should be created before the action is executed.
         '''
 
-        # FIXME: modified from original, needs testing? Since this is now inside
-        #        the action plugin, it should make it just this simple
         return getattr(self, 'TRANSFERS_FILES', False)
 
     def _late_needs_tmp_path(self, tmp, module_style):
@@ -158,8 +154,6 @@ class ActionBase:
             return True
         return False
 
-    # FIXME: return a datastructure in this function instead of raising errors -
-    #        the new executor pipeline handles it much better that way
     def _make_tmp_path(self):
         '''
         Create and return a temporary path on a remote box.
@@ -199,8 +193,6 @@ class ActionBase:
                 output = output + u": %s" % result['stdout']
             raise AnsibleConnectionFailure(output)
 
-        # FIXME: do we still need to do this?
-        #rc = self._connection._shell.join_path(utils.last_non_blank_line(result['stdout']).strip(), '')
         rc = self._connection._shell.join_path(result['stdout'].strip(), u'').splitlines()[-1]
 
         # Catch failure conditions, files should never be

lib/ansible/plugins/action/unarchive.py

@@ -57,14 +57,10 @@ class ActionModule(ActionBase):
         source = os.path.expanduser(source)
 
         if copy:
-            # FIXME: the original file stuff needs to be reworked
-            if '_original_file' in task_vars:
-                source = self._loader.path_dwim_relative(task_vars['_original_file'], 'files', source)
+            if self._task._role is not None:
+                source = self._loader.path_dwim_relative(self._task._role._role_path, 'files', source)
             else:
-                if self._task._role is not None:
-                    source = self._loader.path_dwim_relative(self._task._role._role_path, 'files', source)
-                else:
-                    source = self._loader.path_dwim_relative(self._loader.get_basedir(), 'files', source)
+                source = self._loader.path_dwim_relative(self._loader.get_basedir(), 'files', source)
 
         remote_checksum = self._remote_checksum(dest, all_vars=task_vars)
         if remote_checksum != '3':

lib/ansible/plugins/cache/redis.py

@@ -17,7 +17,6 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
-# FIXME: can we store these as something else before we ship it?
 import sys
 import time
 import json
@@ -95,7 +94,7 @@ class CacheModule(BaseCacheModule):
             self.delete(key)
 
     def copy(self):
-        # FIXME: there is probably a better way to do this in redis
+        # TODO: there is probably a better way to do this in redis
         ret = dict()
         for key in self.keys():
             ret[key] = self.get(key)

lib/ansible/plugins/callback/__init__.py

@@ -40,9 +40,6 @@ class CallbackBase:
     custom actions.
     '''
 
-    # FIXME: the list of functions here needs to be updated once we have
-    #        finalized the list of callback methods used in the default callback
-
     def __init__(self, display):
         self._display = display
         if self._display.verbosity >= 4:

lib/ansible/plugins/connection/accelerate.py

@@ -166,10 +166,6 @@ class Connection(ConnectionBase):
 
         super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
 
-        # FIXME:
-        #if sudoable and self..become and self.runner.become_method not in self.become_methods_supported:
-        #    raise AnsibleError("Internal Error: this module does not support running commands via %s" % self.runner.become_method)
-
         if in_data:
             raise AnsibleError("Internal Error: this module does not support optimized module pipelining")
 

lib/ansible/plugins/connection/ssh.py

@@ -137,9 +137,7 @@ class Connection(ConnectionBase):
         ## Next, additional arguments based on the configuration.
 
         # sftp batch mode allows us to correctly catch failed transfers, but can
-        # be disabled if the client side doesn't support the option. FIXME: is
-        # this still a real concern?
-
+        # be disabled if the client side doesn't support the option.
         if binary == 'sftp' and C.DEFAULT_SFTP_BATCH_MODE:
             self._command += ['-b', '-']
 

lib/ansible/plugins/lookup/flattened.py

@@ -63,7 +63,6 @@ class LookupModule(LookupBase):
 
     def run(self, terms, variables, **kwargs):
 
-        ### FIXME: Is this needed now that listify is run on all lookup plugin terms?
         if not isinstance(terms, list):
             raise AnsibleError("with_flattened expects a list")
 

lib/ansible/plugins/lookup/indexed_items.py

@@ -27,7 +27,6 @@ class LookupModule(LookupBase):
 
     def run(self, terms, variables, **kwargs):
 
-        ### FIXME: Is this needed now that listify is run on all lookup plugin terms?
         if not isinstance(terms, list):
             raise AnsibleError("with_indexed_items expects a list")
 

lib/ansible/plugins/strategy/__init__.py

@@ -47,9 +47,9 @@ except ImportError:
 
 __all__ = ['StrategyBase']
 
-# FIXME: this should probably be in the plugins/__init__.py, with
-#        a smarter mechanism to set all of the attributes based on
-#        the loaders created there
+# TODO: this should probably be in the plugins/__init__.py, with
+#       a smarter mechanism to set all of the attributes based on
+#       the loaders created there
 class SharedPluginLoaderObj:
     '''
     A simple object to make pass the various plugin loaders to
@@ -327,7 +327,6 @@ class StrategyBase:
             allgroup.add_host(new_host)
 
         # Set/update the vars for this host
-        # FIXME: probably should have a set vars method for the host?
         new_vars = host_info.get('host_vars', dict())
         new_host.vars = self._inventory.get_host_vars(new_host)
         new_host.vars.update(new_vars)
@@ -351,7 +350,6 @@ class StrategyBase:
 
         # clear pattern caching completely since it's unpredictable what
         # patterns may have referenced the group
-        # FIXME: is this still required?
         self._inventory.clear_pattern_cache()
 
     def _add_group(self, host, result_item):

lib/ansible/plugins/strategy/free.py

@@ -109,7 +109,6 @@ class StrategyModule(StrategyBase):
                             # since they do not use k=v pairs, so get that
                             meta_action = task.args.get('_raw_params')
                             if meta_action == 'noop':
-                                # FIXME: issue a callback for the noop here?
                                 continue
                             elif meta_action == 'flush_handlers':
                                 # FIXME: in the 'free' mode, flushing handlers should result in
@@ -170,8 +169,6 @@ class StrategyModule(StrategyBase):
             results = self._wait_on_pending_results(iterator)
             host_results.extend(results)
         except Exception as e:
-            # FIXME: ctrl+c can cause some failures here, so catch them
-            #        with the appropriate error type
             pass
 
         # run the base class run() method, which executes the cleanup function