github/pelican
1
0
Fork 1
mirror of https://github.com/getpelican/pelican.git synced 2025-10-15 20:28:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2758 from MinchinWeb/settings-pathlib-2

Browse source
This commit is contained in:
Justin Mayer 2023-10-28 21:56:34 +02:00 • committed by GitHub
commit e14f20bb99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 75 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pelican/settings.py
View file

@ -7,6 +7,7 @@ import os
import re
import sys
from os.path import isabs
from pathlib import Path
from pelican.log import LimitFilter
@ -408,7 +409,10 @@ def handle_deprecated_settings(settings):
for key in ['TRANSLATION_FEED_ATOM',
'TRANSLATION_FEED_RSS'
]:
if settings.get(key) and '%s' in settings[key]:
if (
settings.get(key) and not isinstance(settings[key], Path)
and '%s' in settings[key]
):
logger.warning('%%s usage in %s is deprecated, use {lang} '
'instead.', key)
try:
@ -425,7 +429,10 @@ def handle_deprecated_settings(settings):
'TAG_FEED_ATOM',
'TAG_FEED_RSS',
]:
if settings.get(key) and '%s' in settings[key]:
if (
settings.get(key) and not isinstance(settings[key], Path)
and '%s' in settings[key]
):
logger.warning('%%s usage in %s is deprecated, use {slug} '
'instead.', key)
try: