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 #1380 from avaris/py34_warnings

Browse source 
Fix for Python 3.4 deprecation warnings while running tests
This commit is contained in:
Justin Mayer 2014-06-27 05:49:03 -07:00
commit 8fe05bb599
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pelican/tools/pelican_import.py
View file

@ -4,11 +4,10 @@
from __future__ import unicode_literals, print_function
import argparse
try:
# py3k import
from html.parser import HTMLParser
from html import unescape # py3.4+
except ImportError:
# py2 import
from HTMLParser import HTMLParser # NOQA
from six.moves.html_parser import HTMLParser
unescape = HTMLParser().unescape
import os
import re
import subprocess
@ -129,7 +128,7 @@ def wp2fields(xml, wp_custpost=False):
try:
# Use HTMLParser due to issues with BeautifulSoup 3
title = HTMLParser().unescape(item.title.contents[0])
title = unescape(item.title.contents[0])
except IndexError:
title = 'No title [%s]' % item.find('post_name').string
logger.warning('Post "%s" is lacking a proper title' % title)