From 2a3d7d031949e0b3ae693b8867350d3e40bb7f13 Mon Sep 17 00:00:00 2001 From: dave mankoff Date: Mon, 28 Jan 2013 22:21:45 -0500 Subject: [PATCH] fix python3 support --- pelican/readers.py | 5 ++++- tests/test_readers.py | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pelican/readers.py b/pelican/readers.py index 9b8be192..8667a299 100644 --- a/pelican/readers.py +++ b/pelican/readers.py @@ -26,7 +26,10 @@ except ImportError: import re import cgi -from HTMLParser import HTMLParser +try: + from html.parser import HTMLParser +except ImportError: + from HTMLParser import HTMLParser from pelican.contents import Category, Tag, Author from pelican.utils import get_date, pelican_open diff --git a/tests/test_readers.py b/tests/test_readers.py index 49130669..39bc2067 100644 --- a/tests/test_readers.py +++ b/tests/test_readers.py @@ -286,9 +286,9 @@ class HTMLReaderTest(unittest.TestCase): content, metadata = reader.read(_path('article_with_metadata.html')) expected = { 'category': 'yeah', - 'author': u'Alexis Métaireau', + 'author': 'Alexis Métaireau', 'title': 'This is a super article !', - 'summary': u'''Summary and stuff''', + 'summary': 'Summary and stuff', 'date': datetime.datetime(2010, 12, 2, 10, 14), 'tags': ['foo', 'bar', 'foobar'], 'custom_field': 'http://notmyidea.org',