Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: getnikola/nikola
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5b7bce0bb387
Choose a base ref
...
head repository: getnikola/nikola
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 806580d0ab40
Choose a head ref
  • 2 commits
  • 4 files changed
  • 1 contributor

Commits on Jul 5, 2015

  1. Add fallback site.loghandlers 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Jul 5, 2015
    Copy the full SHA
    48ac4fb View commit details

  2. Remove site.loghandlers from auto and ipynb 

    Signed-off-by: Chris Warrick <kwpolska@gmail.com>
    @Kwpolska
    Kwpolska committed Jul 5, 2015
    Copy the full SHA
    806580d View commit details
Showing with 6 additions and 4 deletions.
  1. +1 −0 nikola/nikola.py
  2. +2 −2 nikola/plugins/command/auto/__init__.py
  3. +2 −2 nikola/plugins/compile/ipynb.py
  4. +1 −0 tests/base.py
1 change: 1 addition & 0 deletions nikola/nikola.py
View file
Original file line number Diff line number Diff line change
@@ -281,6 +281,7 @@ def __init__(self, **config):
self._template_system = None
self._THEMES = None
self.debug = DEBUG
self.loghandlers = utils.STDERR_HANDLER # TODO remove on v8
self.colorful = config.pop('__colorful__', False)
self.invariant = config.pop('__invariant__', False)
self.quiet = config.pop('__quiet__', False)
4 changes: 2 additions & 2 deletions nikola/plugins/command/auto/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@


from nikola.plugin_categories import Command
from nikola.utils import req_missing, get_logger, get_theme_path
from nikola.utils import req_missing, get_logger, get_theme_path, STDERR_HANDLER
LRJS_PATH = os.path.join(os.path.dirname(__file__), 'livereload.js')
error_signal = signal('error')
refresh_signal = signal('refresh')
@@ -116,7 +116,7 @@ class CommandAuto(Command):
def _execute(self, options, args):
"""Start the watcher."""

self.logger = get_logger('auto', self.site.loghandlers)
self.logger = get_logger('auto', STDERR_HANDLER)
LRSocket.logger = self.logger

if WebSocket is object and watchdog is None:
4 changes: 2 additions & 2 deletions nikola/plugins/compile/ipynb.py
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@
flag = None

from nikola.plugin_categories import PageCompiler
from nikola.utils import makedirs, req_missing, get_logger
from nikola.utils import makedirs, req_missing, get_logger, STDERR_HANDLER


class CompileIPynb(PageCompiler):
@@ -61,7 +61,7 @@ class CompileIPynb(PageCompiler):
default_kernel = 'python2' if sys.version_info[0] == 2 else 'python3'

def set_site(self, site):
self.logger = get_logger('compile_ipynb', site.loghandlers)
self.logger = get_logger('compile_ipynb', STDERR_HANDLER)
super(CompileIPynb, self).set_site(site)

def compile_html(self, source, dest, is_two_file=True):
1 change: 1 addition & 0 deletions tests/base.py
View file
Original file line number Diff line number Diff line change
@@ -216,6 +216,7 @@ def __init__(self):
"RestExtension": RestExtension,
"MarkdownExtension": MarkdownExtension,
})
self.loghandlers = nikola.utils.STDERR_HANDLER # TODO remove on v8
self.plugin_manager.setPluginInfoExtension('plugin')
if sys.version_info[0] == 3:
places = [