forked from github/pelican
Merge pull request #2130 from ingwinlu/more_py36_regex_warnings
Fix more Python 3.6 regex warnings
This commit is contained in:
Justin Mayer
GitHub
commit
fa1d4d937c
5 changed files with 30 additions and 30 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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<slug>[^.]*).*',
|
||||
... 'FILENAME_METADATA': r'(?P<slug>[^.]*).*',
|
||||
... 'PATH_METADATA':
|
||||
... '(?P<category>[^/]*)/(?P<date>\d{4}-\d{2}-\d{2})/.*',
|
||||
... r'(?P<category>[^/]*)/(?P<date>\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': <pelican.urlwrappers.Category object at ...>,
|
||||
... 'date': SafeDatetime(2013, 1, 1, 0, 0),
|
||||
... 'slug': 'my-slug'}
|
||||
{'category': <pelican.urlwrappers.Category object at ...>,
|
||||
'date': SafeDatetime(2013, 1, 1, 0, 0),
|
||||
'slug': 'my-slug'}
|
||||
"""
|
||||
metadata = {}
|
||||
dirname, basename = os.path.split(source_path)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
||||
|
|
|
|||
|
|
@ -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<date>\d{4}-\d{2}-\d{2}).*')
|
||||
FILENAME_METADATA=r'(?P<date>\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<date>\d{4}-\d{2}-\d{2})'
|
||||
'_(?P<Slug>.*)'
|
||||
'#(?P<MyMeta>.*)-(?P<author>.*)'))
|
||||
r'(?P<date>\d{4}-\d{2}-\d{2})'
|
||||
r'_(?P<Slug>.*)'
|
||||
r'#(?P<MyMeta>.*)-(?P<author>.*)'))
|
||||
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<date>\d{4}-\d{2}-\d{2})?')
|
||||
FILENAME_METADATA=r'(?P<date>\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<date>\d{4}-\d{2}-\d{2})?')
|
||||
FILENAME_METADATA=r'(?P<date>\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<date>\d{4}-\d{2}-\d{2})'
|
||||
'_(?P<Slug>.*)'
|
||||
'#(?P<MyMeta>.*)-(?P<author>.*)'
|
||||
r'(?P<date>\d{4}-\d{2}-\d{2})'
|
||||
r'_(?P<Slug>.*)'
|
||||
r'#(?P<MyMeta>.*)-(?P<author>.*)'
|
||||
),
|
||||
EXTRA_PATH_METADATA={
|
||||
input_with_metadata: {
|
||||
|
|
@ -250,9 +250,9 @@ class RstReaderTest(ReaderTest):
|
|||
page = self.read_file(
|
||||
path=input_file_path,
|
||||
FILENAME_METADATA=(
|
||||
'(?P<date>\d{4}-\d{2}-\d{2})'
|
||||
'_(?P<Slug>.*)'
|
||||
'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
|
||||
r'(?P<date>\d{4}-\d{2}-\d{2})'
|
||||
r'_(?P<Slug>.*)'
|
||||
r'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
|
||||
),
|
||||
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<date>\d{4}-\d{2}-\d{2}).*')
|
||||
FILENAME_METADATA=r'(?P<date>\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<date>\d{4}-\d{2}-\d{2})'
|
||||
'_(?P<Slug>.*)'
|
||||
'#(?P<MyMeta>.*)-(?P<author>.*)'))
|
||||
r'(?P<date>\d{4}-\d{2}-\d{2})'
|
||||
r'_(?P<Slug>.*)'
|
||||
r'#(?P<MyMeta>.*)-(?P<author>.*)'))
|
||||
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<date>\d{4}-\d{2}-\d{2})?')
|
||||
FILENAME_METADATA=r'(?P<date>\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<date>\d{4}-\d{2}-\d{2})?')
|
||||
FILENAME_METADATA=r'(?P<date>\d{4}-\d{2}-\d{2})?')
|
||||
expected = {
|
||||
'reader': 'markdown',
|
||||
}
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ def decode_wp_content(content, br=True):
|
|||
content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
|
||||
content = content.replace('</blockquote></p>', '</p></blockquote>')
|
||||
content = re.sub(r'<p>\s*(</?' + allblocks + '[^>]*>)', "\\1", content)
|
||||
content = re.sub(r'(</?' + allblocks + '[^>]*>)\s*</p>', "\\1", content)
|
||||
content = re.sub(r'(</?' + allblocks + r'[^>]*>)\s*</p>', "\\1", content)
|
||||
if br:
|
||||
def _preserve_newline(match):
|
||||
return match.group(0).replace("\n", "<WPPreserveNewline />")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue