use PluginDicts correctly

Signed-off-by: Chris Warrick <kwpolska@gmail.com>
getnikola · Apr 25, 2015 · b9f081e · b9f081e
1 parent a73ed63
commit b9f081e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/nikola/plugins/command/check.py b/nikola/plugins/command/check.py
@@ -142,7 +142,7 @@ class CommandCheck(Command):
     def _execute(self, options, args):
         """Check the generated site."""
         self.logger = get_logger('check', self.site.loghandlers)
-        self.l = self._doitargs['cmds']['list'](config=self.config, **self._doitargs)
+        self.l = self._doitargs['cmds'].get_plugin('list')(config=self.config, **self._doitargs)
 
         if not options['links'] and not options['files'] and not options['clean']:
             print(self.help())

diff --git a/nikola/utils.py b/nikola/utils.py
@@ -1311,7 +1311,7 @@ def __init__(self, main, config, doitargs):
         self._main = main
         self._config = config
         self._doitargs = doitargs
-        for k, v in self._main.get_cmds().items():
+        for k, v in self._doitargs['cmds'].to_dict().items():
             # cleanup: run is doit-only, init is useless in an existing site
             if k in ['run', 'init']:
                 continue
@@ -1342,7 +1342,7 @@ def _run(self, cmd_args):
     def _run_with_kw(self, cmd, *a, **kw):
         # cyclic import hack
         from nikola.plugin_categories import Command
-        cmd = self._main.get_cmds()[cmd]
+        cmd = self._doitargs['cmds'].get_plugin(cmd)
         try:
             opt = cmd.get_options()
         except TypeError: