Skip to content

Commit

Permalink
fix #1868
Browse files Browse the repository at this point in the history
  • Loading branch information
ralsina committed Jul 7, 2015
1 parent c8f7a6a commit 9a4704e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions CHANGES.txt
Expand Up @@ -11,6 +11,7 @@ Features
Bugfixes Bugfixes
-------- --------


* Don't use deprecated Yapsy methods (Isue #1868)
* Surpress wincing when auto is aborted during rebuilding * Surpress wincing when auto is aborted during rebuilding
* Show tags only from the current language on tag listing pages (Issue #1856) * Show tags only from the current language on tag listing pages (Issue #1856)
* Remove gap between line numbers and code (Issue #1859) * Remove gap between line numbers and code (Issue #1859)
Expand Down
4 changes: 2 additions & 2 deletions nikola/nikola.py
Expand Up @@ -677,7 +677,7 @@ def __init__(self, **config):
"ConfigPlugin": ConfigPlugin, "ConfigPlugin": ConfigPlugin,
"PostScanner": PostScanner, "PostScanner": PostScanner,
}) })
self.plugin_manager.setPluginInfoExtension('plugin') self.plugin_manager.getPluginLocator().setPluginInfoExtension('plugin')
extra_plugins_dirs = self.config['EXTRA_PLUGINS_DIRS'] extra_plugins_dirs = self.config['EXTRA_PLUGINS_DIRS']
if sys.version_info[0] == 3: if sys.version_info[0] == 3:
places = [ places = [
Expand All @@ -692,7 +692,7 @@ def __init__(self, **config):
os.path.expanduser('~/.nikola/plugins'), os.path.expanduser('~/.nikola/plugins'),
] + [utils.sys_encode(path) for path in extra_plugins_dirs if path] ] + [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.plugin_manager.collectPlugins()


self._activate_plugins_of_category("SignalHandler") self._activate_plugins_of_category("SignalHandler")
Expand Down

0 comments on commit 9a4704e

Please sign in to comment.