More progress toward __proxy__

salt/loader.py

@@ -180,7 +180,10 @@ def minion_mods(
     if utils is None:
         utils = {}
     if proxy is None:
+        log.debug('minion_mods called with proxy empty')
         proxy = {}
+    else:
+        log.debug('minion_mods called with proxy NOT empty')
     if not whitelist:
         whitelist = opts.get('whitelist_modules', None)
     ret = LazyLoader(_module_dirs(opts, 'modules', 'module'),

salt/modules/rest_service.py

@@ -44,19 +44,6 @@ def get_all():
     return __proxy__[proxy_fn]()
 
 
-def list_():
-    '''
-    Return a list of all available services
-
-    CLI Example:
-
-    .. code-block:: bash
-
-        salt '*' service.list
-    '''
-    return get_all()
-
-
 def list_():
     '''
     Return a list of all available services.

salt/state.py

@@ -738,7 +738,9 @@ class State(object):
         '''
         log.info('Loading fresh modules for state activity')
         self.utils = salt.loader.utils(self.opts)
-        self.functions = salt.loader.minion_mods(self.opts, self.state_con, utils=self.utils, proxy=proxy)
+        self.functions = salt.loader.minion_mods(self.opts, self.state_con, 
+                                                 utils=self.utils,
+                                                 proxy=proxy)
         if isinstance(data, dict):
             if data.get('provider', False):
                 if isinstance(data['provider'], str):