Merge pull request #1869 from getnikola/remove-deprecated-yapsy

fix #1868
getnikola · Jul 7, 2015 · d48d49e · d48d49e
2 parents c8f7a6a + 9a4704e
commit d48d49e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -11,6 +11,7 @@ Features
 Bugfixes
 --------
 
+* Don't use deprecated Yapsy methods (Isue #1868)
 * Surpress wincing when auto is aborted during rebuilding
 * Show tags only from the current language on tag listing pages (Issue #1856)
 * Remove gap between line numbers and code (Issue #1859)

diff --git a/nikola/nikola.py b/nikola/nikola.py
@@ -677,7 +677,7 @@ def __init__(self, **config):
             "ConfigPlugin": ConfigPlugin,
             "PostScanner": PostScanner,
         })
-        self.plugin_manager.setPluginInfoExtension('plugin')
+        self.plugin_manager.getPluginLocator().setPluginInfoExtension('plugin')
         extra_plugins_dirs = self.config['EXTRA_PLUGINS_DIRS']
         if sys.version_info[0] == 3:
             places = [
@@ -692,7 +692,7 @@ def __init__(self, **config):
                 os.path.expanduser('~/.nikola/plugins'),
             ] + [utils.sys_encode(path) for path in extra_plugins_dirs if path]
 
-        self.plugin_manager.setPluginPlaces(places)
+        self.plugin_manager.getPluginLocator().setPluginPlaces(places)
         self.plugin_manager.collectPlugins()
 
         self._activate_plugins_of_category("SignalHandler")