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/plugins
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: dff7c33938f7
Choose a base ref
...
head repository: getnikola/plugins
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 45188b4bb627
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Oct 18, 2016

  1. Copy the full SHA
    0f17e36 View commit details
  2. fix import

    ralsina committed Oct 18, 2016
    Copy the full SHA
    402f848 View commit details
  3. Copy the full SHA
    45188b4 View commit details
Showing with 13 additions and 3 deletions.
  1. +6 −1 v7/import_page/import_page.py
  2. +7 −2 v7/vcs/vcs.py
7 changes: 6 additions & 1 deletion v7/import_page/import_page.py
Original file line number Diff line number Diff line change
@@ -28,7 +28,10 @@

import codecs

import libextract.api
try:
import libextract.api
except ImportError:
libextract = None
import lxml.html
import requests

@@ -57,6 +60,8 @@ class CommandImportPage(Command):

def _execute(self, options, args):
"""Import a Page."""
if libextract is None:
utils.req_missing(['libextract'], 'use the import_page plugin')
for url in args:
self._import_page(url)

9 changes: 7 additions & 2 deletions v7/vcs/vcs.py
Original file line number Diff line number Diff line change
@@ -28,10 +28,13 @@
import os

from py.path import local
from anyvc import workdir
try:
from anyvc import workdir
except ImportError:
workdir = None

from nikola.plugin_categories import Command
from nikola.utils import get_logger
from nikola.utils import get_logger, req_missing


def get_path_list(path):
@@ -54,6 +57,8 @@ class CommandVCS(Command):
cmd_options = []

def _execute(self, options, args):
if workdir is None:
req_missing(['anyvc'], 'use the anyvc plugin')
logger = get_logger('vcs', self.site.loghandlers)
self.site.scan_posts()