diff --git a/pelican/__init__.py b/pelican/__init__.py
index fa636bb0..70013804 100644
--- a/pelican/__init__.py
+++ b/pelican/__init__.py
@@ -111,10 +111,10 @@ class Pelican(object):
structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
# Convert %(variable) into {variable}.
- structure = re.sub(r'%\((\w+)\)s', '{\g<1>}', structure)
+ structure = re.sub(r'%\((\w+)\)s', r'{\g<1>}', structure)
# Convert %x into {date:%x} for strftime
- structure = re.sub(r'(%[A-z])', '{date:\g<1>}', structure)
+ structure = re.sub(r'(%[A-z])', r'{date:\g<1>}', structure)
# Strip a / prefix
structure = re.sub('^/', '', structure)
diff --git a/pelican/readers.py b/pelican/readers.py
index afc0c4bf..46055962 100644
--- a/pelican/readers.py
+++ b/pelican/readers.py
@@ -636,13 +636,13 @@ def path_metadata(full_path, source_path, settings=None):
def parse_path_metadata(source_path, settings=None, process=None):
- """Extract a metadata dictionary from a file's path
+ r"""Extract a metadata dictionary from a file's path
>>> import pprint
>>> settings = {
- ... 'FILENAME_METADATA': '(?P[^.]*).*',
+ ... 'FILENAME_METADATA': r'(?P[^.]*).*',
... 'PATH_METADATA':
- ... '(?P[^/]*)/(?P\d{4}-\d{2}-\d{2})/.*',
+ ... r'(?P[^/]*)/(?P\d{4}-\d{2}-\d{2})/.*',
... }
>>> reader = BaseReader(settings=settings)
>>> metadata = parse_path_metadata(
@@ -650,9 +650,9 @@ def parse_path_metadata(source_path, settings=None, process=None):
... settings=settings,
... process=reader.process_metadata)
>>> pprint.pprint(metadata) # doctest: +ELLIPSIS
- ... {'category': ,
- ... 'date': SafeDatetime(2013, 1, 1, 0, 0),
- ... 'slug': 'my-slug'}
+ {'category': ,
+ 'date': SafeDatetime(2013, 1, 1, 0, 0),
+ 'slug': 'my-slug'}
"""
metadata = {}
dirname, basename = os.path.split(source_path)
diff --git a/pelican/tests/test_contents.py b/pelican/tests/test_contents.py
index 11fa958a..56928b81 100644
--- a/pelican/tests/test_contents.py
+++ b/pelican/tests/test_contents.py
@@ -105,7 +105,7 @@ class TestPage(LoggedTestCase):
self.assertEqual(page._get_summary(), TEST_SUMMARY)
self.assertLogCountEqual(
count=1,
- msg="_get_summary\(\) has been deprecated since 3\.6\.4\. "
+ msg=r"_get_summary\(\) has been deprecated since 3\.6\.4\. "
"Use the summary decorator instead",
level=logging.WARNING)
diff --git a/pelican/tests/test_readers.py b/pelican/tests/test_readers.py
index 0d22bf44..4db4938e 100644
--- a/pelican/tests/test_readers.py
+++ b/pelican/tests/test_readers.py
@@ -67,7 +67,7 @@ class TestAssertDictHasSubset(ReaderTest):
six.assertRaisesRegex(
self,
AssertionError,
- 'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
+ r'Expected.*key-c.*to have value.*val-c.*but was not in Dict',
self.assertDictHasSubset,
self.dictionary,
{'key-c': 'val-c'})
@@ -76,7 +76,7 @@ class TestAssertDictHasSubset(ReaderTest):
six.assertRaisesRegex(
self,
AssertionError,
- 'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
+ r'Expected .*key-a.* to have value .*val-b.* but was .*val-a.*',
self.assertDictHasSubset,
self.dictionary,
{'key-a': 'val-b'})
@@ -139,7 +139,7 @@ class RstReaderTest(ReaderTest):
page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2}).*')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2}).*')
expected = {
'category': 'yeah',
'author': 'Alexis Métaireau',
@@ -152,9 +152,9 @@ class RstReaderTest(ReaderTest):
page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
FILENAME_METADATA=(
- '(?P\d{4}-\d{2}-\d{2})'
- '_(?P.*)'
- '#(?P.*)-(?P.*)'))
+ r'(?P\d{4}-\d{2}-\d{2})'
+ r'_(?P.*)'
+ r'#(?P.*)-(?P.*)'))
expected = {
'category': 'yeah',
'author': 'Alexis Métaireau',
@@ -169,7 +169,7 @@ class RstReaderTest(ReaderTest):
def test_article_with_optional_filename_metadata(self):
page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2})?')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2})?')
expected = {
'date': SafeDatetime(2012, 11, 29),
'reader': 'rst',
@@ -178,7 +178,7 @@ class RstReaderTest(ReaderTest):
page = self.read_file(
path='article.rst',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2})?')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2})?')
expected = {
'reader': 'rst',
}
@@ -200,9 +200,9 @@ class RstReaderTest(ReaderTest):
page_metadata = self.read_file(
path=input_with_metadata,
FILENAME_METADATA=(
- '(?P\d{4}-\d{2}-\d{2})'
- '_(?P.*)'
- '#(?P.*)-(?P.*)'
+ r'(?P\d{4}-\d{2}-\d{2})'
+ r'_(?P.*)'
+ r'#(?P.*)-(?P.*)'
),
EXTRA_PATH_METADATA={
input_with_metadata: {
@@ -250,9 +250,9 @@ class RstReaderTest(ReaderTest):
page = self.read_file(
path=input_file_path,
FILENAME_METADATA=(
- '(?P\d{4}-\d{2}-\d{2})'
- '_(?P.*)'
- '#(?P.*)-(?P.*)'
+ r'(?P\d{4}-\d{2}-\d{2})'
+ r'_(?P.*)'
+ r'#(?P.*)-(?P.*)'
),
EXTRA_PATH_METADATA={
input_file_path: {
@@ -557,7 +557,7 @@ class MdReaderTest(ReaderTest):
page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2}).*')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2}).*')
expected = {
'category': 'yeah',
'author': 'Alexis Métaireau',
@@ -568,9 +568,9 @@ class MdReaderTest(ReaderTest):
page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md',
FILENAME_METADATA=(
- '(?P\d{4}-\d{2}-\d{2})'
- '_(?P.*)'
- '#(?P.*)-(?P.*)'))
+ r'(?P\d{4}-\d{2}-\d{2})'
+ r'_(?P.*)'
+ r'#(?P.*)-(?P.*)'))
expected = {
'category': 'yeah',
'author': 'Alexis Métaireau',
@@ -583,7 +583,7 @@ class MdReaderTest(ReaderTest):
def test_article_with_optional_filename_metadata(self):
page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2})?')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2})?')
expected = {
'date': SafeDatetime(2012, 11, 30),
'reader': 'markdown',
@@ -592,7 +592,7 @@ class MdReaderTest(ReaderTest):
page = self.read_file(
path='empty.md',
- FILENAME_METADATA='(?P\d{4}-\d{2}-\d{2})?')
+ FILENAME_METADATA=r'(?P\d{4}-\d{2}-\d{2})?')
expected = {
'reader': 'markdown',
}
diff --git a/pelican/tools/pelican_import.py b/pelican/tools/pelican_import.py
index 204ab7b0..ef4a20e0 100755
--- a/pelican/tools/pelican_import.py
+++ b/pelican/tools/pelican_import.py
@@ -88,7 +88,7 @@ def decode_wp_content(content, br=True):
content = re.sub(r']*)>', "", content)
content = content.replace('
', '')
content = re.sub(r'\s*(?' + allblocks + '[^>]*>)', "\\1", content)
- content = re.sub(r'(?' + allblocks + '[^>]*>)\s*
', "\\1", content)
+ content = re.sub(r'(?' + allblocks + r'[^>]*>)\s*', "\\1", content)
if br:
def _preserve_newline(match):
return match.group(0).replace("\n", "")