diff --git a/ebook_converter/tinycss/media3.py b/ebook_converter/tinycss/media3.py index e429582..fa4c136 100644 --- a/ebook_converter/tinycss/media3.py +++ b/ebook_converter/tinycss/media3.py @@ -1,10 +1,5 @@ from ebook_converter.tinycss.css21 import CSS21Parser from ebook_converter.tinycss.parsing import remove_whitespace, split_on_comma, ParseError -from ebook_converter.polyglot.builtins import error_message - - -__license__ = 'GPL v3' -__copyright__ = '2014, Kovid Goyal ' class MediaQuery(object): @@ -96,7 +91,7 @@ class CSSMedia3Parser(CSS21Parser): expressions.append((media_feature, expr)) except MalformedExpression as err: - errors.append(ParseError(err.tok, error_message(err))) + errors.append(ParseError(err.tok, str(err))) media_type, negated, expressions = 'all', True, () queries.append(MediaQuery(media_type or 'all', expressions=tuple(expressions), negated=negated)) diff --git a/ebook_converter/utils/formatter.py b/ebook_converter/utils/formatter.py index 0b1cec1..5dbbfcc 100644 --- a/ebook_converter/utils/formatter.py +++ b/ebook_converter/utils/formatter.py @@ -8,12 +8,6 @@ import re, string, traceback, numbers from ebook_converter import prints from ebook_converter.constants_old import DEBUG from ebook_converter.utils.formatter_functions import formatter_functions -from ebook_converter.polyglot.builtins import error_message - - -__license__ = 'GPL v3' -__copyright__ = '2010, Kovid Goyal ' -__docformat__ = 'restructuredtext en' class _Parser(object):