Merge pull request #9293 from cchurch/module_suffixes

Simpler fix for module suffixes than c02e8d8c8.

lib/ansible/runner/__init__.py

@@ -1347,7 +1347,7 @@ class Runner(object):
 
         # Search module path(s) for named module.
         module_suffixes = getattr(conn, 'default_suffixes', None)
-        module_path = utils.plugins.module_finder.find_plugin(module_name, module_suffixes, transport=self.transport)
+        module_path = utils.plugins.module_finder.find_plugin(module_name, module_suffixes)
         if module_path is None:
             module_path2 = utils.plugins.module_finder.find_plugin('ping', module_suffixes)
             if module_path2 is not None:

lib/ansible/utils/plugins.py

@@ -156,17 +156,14 @@ class PluginLoader(object):
                 self._extra_dirs.append(directory)
                 self._paths = None
 
-    def find_plugin(self, name, suffixes=None, transport=''):
+    def find_plugin(self, name, suffixes=None):
         ''' Find a plugin named name '''
 
         if not suffixes:
             if self.class_name:
                 suffixes = ['.py']
             else:
-                if transport == 'winrm':
+                suffixes = ['.py', '']
-                    suffixes = ['.ps1', '']
-                else:
-                    suffixes = ['.py', '']
 
         potential_names = frozenset('%s%s' % (name, s) for s in suffixes)
         for full_name in potential_names: