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 #2130 from ingwinlu/more_py36_regex_warnings

Browse source 
Fix more Python 3.6 regex warnings
This commit is contained in:
Justin Mayer 2017-05-31 09:10:22 -07:00 • committed by GitHub
commit fa1d4d937c
5 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pelican/__init__.py
View file

@ -111,10 +111,10 @@ class Pelican(object):
structure = self.settings['ARTICLE_PERMALINK_STRUCTURE'] structure = self.settings['ARTICLE_PERMALINK_STRUCTURE']
# Convert %(variable) into {variable}. # 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 # 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 # Strip a / prefix
structure = re.sub('^/', '', structure) structure = re.sub('^/', '', structure)

12
pelican/readers.py
View file

@ -636,13 +636,13 @@ def path_metadata(full_path, source_path, settings=None):
def parse_path_metadata(source_path, settings=None, process=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 >>> import pprint
>>> settings = { >>> settings = {
... 'FILENAME_METADATA': '(?P<slug>[^.]*).*', ... 'FILENAME_METADATA': r'(?P<slug>[^.]*).*',
... 'PATH_METADATA': ... '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) >>> reader = BaseReader(settings=settings)
>>> metadata = parse_path_metadata( >>> metadata = parse_path_metadata(
@ -650,9 +650,9 @@ def parse_path_metadata(source_path, settings=None, process=None):
... settings=settings, ... settings=settings,
... process=reader.process_metadata) ... process=reader.process_metadata)
>>> pprint.pprint(metadata) # doctest: +ELLIPSIS >>> pprint.pprint(metadata) # doctest: +ELLIPSIS
... {'category': <pelican.urlwrappers.Category object at ...>, {'category': <pelican.urlwrappers.Category object at ...>,
... 'date': SafeDatetime(2013, 1, 1, 0, 0), 'date': SafeDatetime(2013, 1, 1, 0, 0),
... 'slug': 'my-slug'} 'slug': 'my-slug'}
""" """
metadata = {} metadata = {}
dirname, basename = os.path.split(source_path) dirname, basename = os.path.split(source_path)

2
pelican/tests/test_contents.py
View file

@ -105,7 +105,7 @@ class TestPage(LoggedTestCase):
self.assertEqual(page._get_summary(), TEST_SUMMARY) self.assertEqual(page._get_summary(), TEST_SUMMARY)
self.assertLogCountEqual( self.assertLogCountEqual(
count=1, 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", "Use the summary decorator instead",
level=logging.WARNING) level=logging.WARNING)

40
pelican/tests/test_readers.py
View file

@ -67,7 +67,7 @@ class TestAssertDictHasSubset(ReaderTest):
six.assertRaisesRegex( six.assertRaisesRegex(
self, self,
AssertionError, 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.assertDictHasSubset,
self.dictionary, self.dictionary,
{'key-c': 'val-c'}) {'key-c': 'val-c'})
@ -76,7 +76,7 @@ class TestAssertDictHasSubset(ReaderTest):
six.assertRaisesRegex( six.assertRaisesRegex(
self, self,
AssertionError, 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.assertDictHasSubset,
self.dictionary, self.dictionary,
{'key-a': 'val-b'}) {'key-a': 'val-b'})
@ -139,7 +139,7 @@ class RstReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst', 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 = { expected = {
'category': 'yeah', 'category': 'yeah',
'author': 'Alexis Métaireau', 'author': 'Alexis Métaireau',
@ -152,9 +152,9 @@ class RstReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst', path='2012-11-29_rst_w_filename_meta#foo-bar.rst',
FILENAME_METADATA=( FILENAME_METADATA=(
'(?P<date>\d{4}-\d{2}-\d{2})' r'(?P<date>\d{4}-\d{2}-\d{2})'
'_(?P<Slug>.*)' r'_(?P<Slug>.*)'
'#(?P<MyMeta>.*)-(?P<author>.*)')) r'#(?P<MyMeta>.*)-(?P<author>.*)'))
expected = { expected = {
'category': 'yeah', 'category': 'yeah',
'author': 'Alexis Métaireau', 'author': 'Alexis Métaireau',
@ -169,7 +169,7 @@ class RstReaderTest(ReaderTest):
def test_article_with_optional_filename_metadata(self): def test_article_with_optional_filename_metadata(self):
page = self.read_file( page = self.read_file(
path='2012-11-29_rst_w_filename_meta#foo-bar.rst', 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 = { expected = {
'date': SafeDatetime(2012, 11, 29), 'date': SafeDatetime(2012, 11, 29),
'reader': 'rst', 'reader': 'rst',
@ -178,7 +178,7 @@ class RstReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='article.rst', 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 = { expected = {
'reader': 'rst', 'reader': 'rst',
} }
@ -200,9 +200,9 @@ class RstReaderTest(ReaderTest):
page_metadata = self.read_file( page_metadata = self.read_file(
path=input_with_metadata, path=input_with_metadata,
FILENAME_METADATA=( FILENAME_METADATA=(
'(?P<date>\d{4}-\d{2}-\d{2})' r'(?P<date>\d{4}-\d{2}-\d{2})'
'_(?P<Slug>.*)' r'_(?P<Slug>.*)'
'#(?P<MyMeta>.*)-(?P<author>.*)' r'#(?P<MyMeta>.*)-(?P<author>.*)'
), ),
EXTRA_PATH_METADATA={ EXTRA_PATH_METADATA={
input_with_metadata: { input_with_metadata: {
@ -250,9 +250,9 @@ class RstReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path=input_file_path, path=input_file_path,
FILENAME_METADATA=( FILENAME_METADATA=(
'(?P<date>\d{4}-\d{2}-\d{2})' r'(?P<date>\d{4}-\d{2}-\d{2})'
'_(?P<Slug>.*)' r'_(?P<Slug>.*)'
'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)' r'#(?P<MyMeta>.*)-(?P<orginalauthor>.*)'
), ),
EXTRA_PATH_METADATA={ EXTRA_PATH_METADATA={
input_file_path: { input_file_path: {
@ -557,7 +557,7 @@ class MdReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md', 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 = { expected = {
'category': 'yeah', 'category': 'yeah',
'author': 'Alexis Métaireau', 'author': 'Alexis Métaireau',
@ -568,9 +568,9 @@ class MdReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md', path='2012-11-30_md_w_filename_meta#foo-bar.md',
FILENAME_METADATA=( FILENAME_METADATA=(
'(?P<date>\d{4}-\d{2}-\d{2})' r'(?P<date>\d{4}-\d{2}-\d{2})'
'_(?P<Slug>.*)' r'_(?P<Slug>.*)'
'#(?P<MyMeta>.*)-(?P<author>.*)')) r'#(?P<MyMeta>.*)-(?P<author>.*)'))
expected = { expected = {
'category': 'yeah', 'category': 'yeah',
'author': 'Alexis Métaireau', 'author': 'Alexis Métaireau',
@ -583,7 +583,7 @@ class MdReaderTest(ReaderTest):
def test_article_with_optional_filename_metadata(self): def test_article_with_optional_filename_metadata(self):
page = self.read_file( page = self.read_file(
path='2012-11-30_md_w_filename_meta#foo-bar.md', 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 = { expected = {
'date': SafeDatetime(2012, 11, 30), 'date': SafeDatetime(2012, 11, 30),
'reader': 'markdown', 'reader': 'markdown',
@ -592,7 +592,7 @@ class MdReaderTest(ReaderTest):
page = self.read_file( page = self.read_file(
path='empty.md', 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 = { expected = {
'reader': 'markdown', 'reader': 'markdown',
} }

2
pelican/tools/pelican_import.py
View file

@ -88,7 +88,7 @@ def decode_wp_content(content, br=True):
content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content) content = re.sub(r'<p><blockquote([^>]*)>', "<blockquote\\1><p>", content)
content = content.replace('</blockquote></p>', '</p></blockquote>') content = content.replace('</blockquote></p>', '</p></blockquote>')
content = re.sub(r'<p>\s*(</?' + allblocks + '[^>]*>)', "\\1", content) 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: if br:
def _preserve_newline(match): def _preserve_newline(match):
return match.group(0).replace("\n", "<WPPreserveNewline />") return match.group(0).replace("\n", "<WPPreserveNewline />")