Skip to content

Commit b8a155a

Browse files
ralsinaralsina
committedMar 8, 2016
merged master
·
v8.3.1v7.7.7
2 parents 17c9775 + 3f1a22d commit b8a155a

18 files changed

+78
-56
lines changed
 

‎CHANGES.txt

+15-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
New in master
2-
============
2+
=============
33

44
Features
55
--------
66

7-
* New Oembed-based media shortcode (Issue #2170)
87
* New Pygal-based chart shortcode (Issue #2170)
8+
* Add ``post_type`` to post-list directive (Issue #2272)
9+
* Use ``sys.executable`` for launching pip in ``plugin`` (Issue #2275)
10+
11+
Bugfixes
12+
--------
13+
14+
* Fix a JSON conversion bug in the WordPress importer (Issue #2264)
15+
* Don’t create download directories when not downloading WordPress
16+
attachments (Issue #2260)
17+
* Don’t display “Good link” messages in ``nikola check -l`` by default,
18+
can be re-enabled with ``-v`` option (Issue #2268)
19+
* Fix a format string in ``nikola check`` (Issue #2267)
20+
* Don't crash wordpress importer when posts are "empty" (Issue #2263)
21+
* Don't put untranslated and nonexistant posts in sitemap (Issue #2289)
922

1023
New in v7.7.6
1124
=============

‎docs/extending.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Extending Nikola
1010
================
1111

12-
:Version: v7.7.6
12+
:Version: 7.7.6
1313
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>
1414

1515
.. class:: alert alert-info pull-right

‎docs/man/nikola.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Nikola
66
A Static Site and Blog Generator
77
--------------------------------
88

9-
:Version: Nikola vv7.7.6
9+
:Version: Nikola v7.7.6
1010
:Manual section: 1
1111
:Manual group: User Commands
1212

‎docs/manual.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
The Nikola Handbook
1010
===================
1111

12-
:Version: v7.7.6
12+
:Version: 7.7.6
1313

1414
.. class:: alert alert-info pull-right
1515

‎docs/social_buttons.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Using Alternative Social Buttons with Nikola
1010
============================================
1111

12-
:Version: v7.7.6
12+
:Version: 7.7.6
1313

1414
.. class:: alert alert-info pull-right
1515

‎docs/sphinx/conf.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
# built documents.
5555
#
5656
# The short X.Y version.
57-
version = 'v7.7.6'
57+
version = '7.7.6'
5858
# The full version, including alpha/beta/rc tags.
59-
release = 'v7.7.6'
59+
release = '7.7.6'
6060

6161
# The language for content autogenerated by Sphinx. Refer to documentation
6262
# for a list of supported languages.

‎docs/theming.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
Theming Nikola
1010
==============
1111

12-
:Version: v7.7.6
12+
:Version: 7.7.6
1313
:Author: Roberto Alsina <ralsina@netmanagers.com.ar>
1414

1515
.. class:: alert alert-info pull-right

‎nikola/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from __future__ import absolute_import
3030
import os
3131

32-
__version__ = "v7.7.6"
32+
__version__ = "7.7.6"
3333
DEBUG = bool(os.getenv('NIKOLA_DEBUG'))
3434

3535
from .nikola import Nikola # NOQA

‎nikola/plugins/basic_import.py

+6-3
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,12 @@ def transform_content(cls, content):
127127
def write_content(cls, filename, content, rewrite_html=True):
128128
"""Write content to file."""
129129
if rewrite_html:
130-
doc = html.document_fromstring(content)
131-
doc.rewrite_links(replacer)
132-
content = html.tostring(doc, encoding='utf8')
130+
try:
131+
doc = html.document_fromstring(content)
132+
doc.rewrite_links(replacer)
133+
content = html.tostring(doc, encoding='utf8')
134+
except etree.ParserError:
135+
content = content.encode('utf-8')
133136
else:
134137
content = content.encode('utf-8')
135138

‎nikola/plugins/command/check.py

+4-3
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import re
3333
import sys
3434
import time
35+
import logbook
3536
try:
3637
from urllib import unquote
3738
from urlparse import urlparse, urljoin, urldefrag
@@ -164,9 +165,9 @@ def _execute(self, options, args):
164165
print(self.help())
165166
return False
166167
if options['verbose']:
167-
self.logger.level = 1
168+
self.logger.level = logbook.DEBUG
168169
else:
169-
self.logger.level = 4
170+
self.logger.level = logbook.NOTICE
170171
failure = False
171172
if options['links']:
172173
failure |= self.scan_links(options['find_sources'], options['remote'])
@@ -343,7 +344,7 @@ def analyze(self, fname, find_sources=False, check_remote=False):
343344

344345
elif target_filename not in self.existing_targets:
345346
if os.path.exists(target_filename):
346-
self.logger.notice(u"Good link {0} => {1}".format(target, target_filename))
347+
self.logger.info("Good link {0} => {1}".format(target, target_filename))
347348
self.existing_targets.add(target_filename)
348349
else:
349350
rv = True

‎nikola/plugins/command/import_wordpress.py

+17-14
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ def read_xml_file(cls, filename):
382382
if b'<atom:link rel=' in line:
383383
continue
384384
xml.append(line)
385-
return b'\n'.join(xml)
385+
return b''.join(xml)
386386

387387
@classmethod
388388
def get_channel_from_file(cls, filename):
@@ -446,9 +446,6 @@ def populate_context(self, channel):
446446

447447
def download_url_content_to_file(self, url, dst_path):
448448
"""Download some content (attachments) to a file."""
449-
if self.no_downloads:
450-
return
451-
452449
try:
453450
request = requests.get(url, auth=self.auth)
454451
if request.status_code >= 400:
@@ -468,10 +465,13 @@ def import_attachment(self, item, wordpress_namespace):
468465
'foo')
469466
path = urlparse(url).path
470467
dst_path = os.path.join(*([self.output_folder, 'files'] + list(path.split('/'))))
471-
dst_dir = os.path.dirname(dst_path)
472-
utils.makedirs(dst_dir)
473-
LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
474-
self.download_url_content_to_file(url, dst_path)
468+
if self.no_downloads:
469+
LOGGER.info("Skipping downloading {0} => {1}".format(url, dst_path))
470+
else:
471+
dst_dir = os.path.dirname(dst_path)
472+
utils.makedirs(dst_dir)
473+
LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
474+
self.download_url_content_to_file(url, dst_path)
475475
dst_url = '/'.join(dst_path.split(os.sep)[2:])
476476
links[link] = '/' + dst_url
477477
links[url] = '/' + dst_url
@@ -562,15 +562,18 @@ def add(our_key, wp_key, is_int=False, ignore_zero=False, is_float=False):
562562
meta = {}
563563
meta['size'] = size.decode('utf-8')
564564
if width_key in metadata[size_key][size] and height_key in metadata[size_key][size]:
565-
meta['width'] = metadata[size_key][size][width_key]
566-
meta['height'] = metadata[size_key][size][height_key]
565+
meta['width'] = int(metadata[size_key][size][width_key])
566+
meta['height'] = int(metadata[size_key][size][height_key])
567567

568568
path = urlparse(url).path
569569
dst_path = os.path.join(*([self.output_folder, 'files'] + list(path.split('/'))))
570-
dst_dir = os.path.dirname(dst_path)
571-
utils.makedirs(dst_dir)
572-
LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
573-
self.download_url_content_to_file(url, dst_path)
570+
if self.no_downloads:
571+
LOGGER.info("Skipping downloading {0} => {1}".format(url, dst_path))
572+
else:
573+
dst_dir = os.path.dirname(dst_path)
574+
utils.makedirs(dst_dir)
575+
LOGGER.info("Downloading {0} => {1}".format(url, dst_path))
576+
self.download_url_content_to_file(url, dst_path)
574577
dst_url = '/'.join(dst_path.split(os.sep)[2:])
575578
links[url] = '/' + dst_url
576579

‎nikola/plugins/command/plugin.py

+2-1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
from __future__ import print_function
3030
import io
3131
import os
32+
import sys
3233
import shutil
3334
import subprocess
3435
import time
@@ -254,7 +255,7 @@ def do_install(self, url, name, show_install_notes=True):
254255
LOGGER.notice('This plugin has Python dependencies.')
255256
LOGGER.info('Installing dependencies with pip...')
256257
try:
257-
subprocess.check_call(('pip', 'install', '-r', reqpath))
258+
subprocess.check_call((sys.executable, '-m', 'pip', 'install', '-r', reqpath))
258259
except subprocess.CalledProcessError:
259260
LOGGER.error('Could not install the dependencies.')
260261
print('Contents of the requirements.txt file:\n')

‎nikola/plugins/task/sitemap/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ def scan_locs():
158158
continue
159159
alternates = []
160160
if post:
161-
for lang in kw['translations']:
161+
for lang in post.translated_to:
162162
alt_url = post.permalink(lang=lang, absolute=True)
163163
if encodelink(loc) == alt_url:
164164
continue
@@ -215,7 +215,7 @@ def scan_locs():
215215
loc = urljoin(base_url, base_path + path)
216216
alternates = []
217217
if post:
218-
for lang in kw['translations']:
218+
for lang in post.translated_to:
219219
alt_url = post.permalink(lang=lang, absolute=True)
220220
if encodelink(loc) == alt_url:
221221
continue

‎requirements-tests.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
-r requirements-extras.txt
22
mock==1.3.0
33
coverage==4.0.3
4-
pytest==2.8.7
4+
pytest==2.9.0
55
pytest-cov==2.2.1
66
freezegun==0.3.6
7-
python-coveralls==2.6.0
7+
python-coveralls==2.7.0
88
colorama>=0.3.4

‎scripts/github-release.py

+14-6
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,27 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python3
22
import subprocess
3-
import sys
43
import os
4+
import argparse
55

66
if not os.path.exists('.pypt/gh-token'):
77
print("To use this script, you must create a GitHub token first.")
88
print("Get a token here: https://github.com/settings/tokens")
99
print("Then, put it in a file named .pypt/gh-token")
1010
exit(1)
1111

12-
inpf = input if sys.version_info[0] == 3 else raw_input
12+
parser = argparse.ArgumentParser(description="GitHub Release helper")
13+
parser.add_argument("FILE", nargs=1, help="Markdown file to use")
14+
parser.add_argument("TAG", nargs=1, help="Tag name (usually vX.Y.Z)")
15+
16+
args = parser.parse_args()
17+
18+
if not args.TAG[0].startswith("v"):
19+
print("WARNING: tag should start with v")
20+
i = input("Add `v` to tag? [y/n] ")
21+
if i.lower().strip().startswith('y'):
22+
args.TAG[0] = 'v' + args.TAG[0]
1323

14-
FILE = inpf("Markdown file to use: ")
1524
BASEDIR = os.getcwd()
1625
REPO = 'getnikola/nikola'
17-
TAG = inpf("Tag name (usually vX.Y.Z): ")
1826

19-
subprocess.call(['.pypt/ghrel', FILE, BASEDIR, REPO, TAG])
27+
subprocess.call(['.pypt/ghrel', args.FILE[0], BASEDIR, REPO, args.TAG[0]])

‎scripts/set_version.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,12 @@ def sed_like_thing(pattern, repl, path):
2626

2727
if __name__ == "__main__":
2828
inpf = raw_input if sys.version_info[0] == 2 else input
29-
version = inpf("New version number (in format X.Y.Z): ").strip()
29+
while True:
30+
version = inpf("New version number (in format X.Y.Z): ").strip()
31+
if version.startswith('v'):
32+
print("ERROR: the version number must not start with v.")
33+
else:
34+
break
3035

3136
for doc in glob.glob(os.path.join("docs/*.txt")):
3237
sed_like_thing(":Version: .*", ":Version: {0}".format(version), doc)

‎setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ def run(self):
113113

114114

115115
setup(name='Nikola',
116-
version='v7.7.6',
116+
version='7.7.6',
117117
description='A modular, fast, simple, static website and blog generator',
118118
long_description=open('README.rst').read(),
119119
author='Roberto Alsina and others',

‎tests/test_command_import_wordpress.py

+1-13
Original file line numberDiff line numberDiff line change
@@ -238,20 +238,18 @@ def test_importing_posts_and_attachments(self):
238238
```Python
239239
240240
import sys
241-
242241
print sys.version
243242
244243
```
245244
246245
The end.
247-
248246
""", True)
249247

250248
self.assertTrue(write_attachments_info.called)
251249
write_attachments_info.assert_any_call('new_site/posts/2008/07/arzt-und-pfusch-s-i-c-k.attachments.json'.replace('/', os.sep),
252250
{10: {'wordpress_user_name': 'Niko',
253251
'files_meta': [{'width': 300, 'height': 299},
254-
{'width': b'150', 'size': 'thumbnail', 'height': b'150'}],
252+
{'width': 150, 'size': 'thumbnail', 'height': 150}],
255253
'excerpt': 'Arzt+Pfusch - S.I.C.K.',
256254
'date_utc': '2009-07-16 19:40:37',
257255
'content': 'Das Cover von Arzt+Pfusch - S.I.C.K.',
@@ -262,27 +260,17 @@ def test_importing_posts_and_attachments(self):
262260
write_content.assert_any_call(
263261
'new_site/posts/2008/07/arzt-und-pfusch-s-i-c-k.md'.replace('/', os.sep),
264262
'''<img class="size-full wp-image-10 alignright" title="Arzt+Pfusch - S.I.C.K." src="http://some.blog/wp-content/uploads/2008/07/arzt_und_pfusch-sick-cover.png" alt="Arzt+Pfusch - S.I.C.K." width="210" height="209" />Arzt+Pfusch - S.I.C.K.Gerade bin ich \xfcber das Album <em>S.I.C.K</em> von <a title="Arzt+Pfusch" href="http://www.arztpfusch.com/" target="_blank">Arzt+Pfusch</a> gestolpert, welches Arzt+Pfusch zum Download f\xfcr lau anbieten. Das Album steht unter einer Creative Commons <a href="http://creativecommons.org/licenses/by-nc-nd/3.0/de/">BY-NC-ND</a>-Lizenz.
265-
266263
Die Ladung <em>noisebmstupidevildustrial</em> gibts als MP3s mit <a href="http://www.archive.org/download/dmp005/dmp005_64kb_mp3.zip">64kbps</a> und <a href="http://www.archive.org/download/dmp005/dmp005_vbr_mp3.zip">VBR</a>, als Ogg Vorbis und als FLAC (letztere <a href="http://www.archive.org/details/dmp005">hier</a>). <a href="http://www.archive.org/download/dmp005/dmp005-artwork.zip">Artwork</a> und <a href="http://www.archive.org/download/dmp005/dmp005-lyrics.txt">Lyrics</a> gibts nochmal einzeln zum Download.''', True)
267264
write_content.assert_any_call(
268265
'new_site/stories/kontakt.md'.replace('/', os.sep), """<h1>Datenschutz</h1>
269-
270266
Ich erhebe und speichere automatisch in meine Server Log Files Informationen, die dein Browser an mich \xfcbermittelt. Dies sind:
271-
272267
<ul>
273-
274268
<li>Browsertyp und -version</li>
275-
276269
<li>verwendetes Betriebssystem</li>
277-
278270
<li>Referrer URL (die zuvor besuchte Seite)</li>
279-
280271
<li>IP Adresse des zugreifenden Rechners</li>
281-
282272
<li>Uhrzeit der Serveranfrage.</li>
283-
284273
</ul>
285-
286274
Diese Daten sind f\xfcr mich nicht bestimmten Personen zuordenbar. Eine Zusammenf\xfchrung dieser Daten mit anderen Datenquellen wird nicht vorgenommen, die Daten werden einzig zu statistischen Zwecken erhoben.""", True)
287275

288276
self.assertTrue(len(self.import_command.url_map) > 0)

0 commit comments

Comments
 (0)
Please sign in to comment.