Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion nikola/nikola.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"""The main Nikola site object."""

import datetime
from datetime import timezone
import io
import json
import functools
Expand Down Expand Up @@ -1777,7 +1778,7 @@ def generic_rss_feed(self, lang, title, link, description, timeline,
title=title,
link=utils.encodelink(link),
description=description,
lastBuildDate=datetime.datetime.utcnow(),
lastBuildDate=datetime.datetime.now(timezone.utc).replace(tzinfo=None),
generator='Nikola (getnikola.com)',
language=lang
)
Expand Down
4 changes: 2 additions & 2 deletions nikola/plugins/command/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

import subprocess
import time
from datetime import datetime
from datetime import datetime, timezone

import dateutil
from blinker import signal
Expand Down Expand Up @@ -97,7 +97,7 @@ def _execute(self, command, args):

self.logger.info("Successful deployment")

new_deploy = datetime.utcnow()
new_deploy = datetime.now(timezone.utc).replace(tzinfo=None)
if last_deploy is None:
last_deploy = new_deploy
self._emit_deploy_event(last_deploy, new_deploy, clean, undeployed_posts)
Expand Down
10 changes: 8 additions & 2 deletions nikola/plugins/compile/rest/listing.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,19 @@
import docutils.parsers.rst.directives.misc
import pygments
import pygments.util
import docutils
from docutils import core
from docutils import nodes
from docutils.parsers.rst import Directive, directives
from docutils.parsers.rst.roles import set_classes
from docutils.parsers.rst.directives.misc import Include
from pygments.lexers import get_lexer_by_name

# Compatibility layer for docutils versions
if docutils.__version_info__[:2] >= (0, 22):
from docutils.parsers.rst.roles import normalize_options
else:
from docutils.parsers.rst.roles import set_classes as normalize_options

from nikola import utils
from nikola.plugin_categories import RestExtension

Expand Down Expand Up @@ -74,7 +80,7 @@ def run(self):
language = self.arguments[0]
else:
language = 'text'
set_classes(self.options)
normalize_options(self.options)
classes = ['code']
if language:
classes.append(language)
Expand Down
3 changes: 2 additions & 1 deletion nikola/plugins/task/galleries.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"""Render image galleries."""

import datetime
from datetime import timezone
import glob
import io
import json
Expand Down Expand Up @@ -763,7 +764,7 @@ def forward_slashes(path):
title=title,
link=make_url(permalink),
description='',
lastBuildDate=datetime.datetime.utcnow(),
lastBuildDate=datetime.datetime.now(timezone.utc).replace(tzinfo=None),
items=items,
generator='https://getnikola.com/',
language=lang
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/test_translated_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ def test_translated_titles(build, output_dir, other_locale):
# And now let's check the titles
with io.open(normal_file, "r", encoding="utf8") as inf:
doc = lxml.html.parse(inf)
assert doc.find("//title").text == "Foo | Demo Site"
assert doc.find(".//title").text == "Foo | Demo Site"

with io.open(translated_file, "r", encoding="utf8") as inf:
doc = lxml.html.parse(inf)
assert doc.find("//title").text == "Bar | Demo Site"
assert doc.find(".//title").text == "Bar | Demo Site"


@pytest.fixture(scope="module")
Expand Down
2 changes: 1 addition & 1 deletion tests/test_shortcodes.py
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ def __init__(self):
def register_shortcode(self, name, f):
"""Register function f to handle shortcode "name"."""
if name in self.shortcode_registry:
nikola.utils.LOGGER.warn("Shortcode name conflict: %s", name)
nikola.utils.LOGGER.warning("Shortcode name conflict: %s", name)
return
self.shortcode_registry[name] = f

Expand Down
Loading