diff --git a/src/calibre/ebooks/lrf/__init__.py b/src/calibre/ebooks/lrf/__init__.py index 6c696b16ed..6be9e69e13 100644 --- a/src/calibre/ebooks/lrf/__init__.py +++ b/src/calibre/ebooks/lrf/__init__.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' """ diff --git a/src/calibre/ebooks/lrf/html/__init__.py b/src/calibre/ebooks/lrf/html/__init__.py index 9e110971bf..cb4d4686eb 100644 --- a/src/calibre/ebooks/lrf/html/__init__.py +++ b/src/calibre/ebooks/lrf/html/__init__.py @@ -1,3 +1,5 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' """ diff --git a/src/calibre/ebooks/lrf/html/color_map.py b/src/calibre/ebooks/lrf/html/color_map.py index 9c74c61018..ce4af2d71d 100644 --- a/src/calibre/ebooks/lrf/html/color_map.py +++ b/src/calibre/ebooks/lrf/html/color_map.py @@ -1,99 +1,101 @@ +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' import re NAME_MAP = { - u'aliceblue': u'#F0F8FF', - u'antiquewhite': u'#FAEBD7', - u'aqua': u'#00FFFF', - u'aquamarine': u'#7FFFD4', - u'azure': u'#F0FFFF', - u'beige': u'#F5F5DC', - u'bisque': u'#FFE4C4', - u'black': u'#000000', - u'blanchedalmond': u'#FFEBCD', - u'blue': u'#0000FF', - u'brown': u'#A52A2A', - u'burlywood': u'#DEB887', - u'cadetblue': u'#5F9EA0', - u'chartreuse': u'#7FFF00', - u'chocolate': u'#D2691E', - u'coral': u'#FF7F50', - u'crimson': u'#DC143C', - u'cyan': u'#00FFFF', - u'darkblue': u'#00008B', - u'darkgoldenrod': u'#B8860B', - u'darkgreen': u'#006400', - u'darkkhaki': u'#BDB76B', - u'darkmagenta': u'#8B008B', - u'darkolivegreen': u'#556B2F', - u'darkorange': u'#FF8C00', - u'darkorchid': u'#9932CC', - u'darkred': u'#8B0000', - u'darksalmon': u'#E9967A', - u'darkslateblue': u'#483D8B', - u'darkslategrey': u'#2F4F4F', - u'darkviolet': u'#9400D3', - u'deeppink': u'#FF1493', - u'dodgerblue': u'#1E90FF', - u'firebrick': u'#B22222', - u'floralwhite': u'#FFFAF0', - u'forestgreen': u'#228B22', - u'fuchsia': u'#FF00FF', - u'gainsboro': u'#DCDCDC', - u'ghostwhite': u'#F8F8FF', - u'gold': u'#FFD700', - u'goldenrod': u'#DAA520', - u'indianred ': u'#CD5C5C', - u'indigo ': u'#4B0082', - u'khaki': u'#F0E68C', - u'lavenderblush': u'#FFF0F5', - u'lawngreen': u'#7CFC00', - u'lightblue': u'#ADD8E6', - u'lightcoral': u'#F08080', - u'lightgoldenrodyellow': u'#FAFAD2', - u'lightgray': u'#D3D3D3', - u'lightgrey': u'#D3D3D3', - u'lightskyblue': u'#87CEFA', - u'lightslategrey': u'#778899', - u'lightsteelblue': u'#B0C4DE', - u'lime': u'#87CEFA', - u'linen': u'#FAF0E6', - u'magenta': u'#FF00FF', - u'maroon': u'#800000', - u'mediumaquamarine': u'#66CDAA', - u'mediumblue': u'#0000CD', - u'mediumorchid': u'#BA55D3', - u'mediumpurple': u'#9370D8', - u'mediumseagreen': u'#3CB371', - u'mediumslateblue': u'#7B68EE', - u'midnightblue': u'#191970', - u'moccasin': u'#FFE4B5', - u'navajowhite': u'#FFDEAD', - u'navy': u'#000080', - u'oldlace': u'#FDF5E6', - u'olive': u'#808000', - u'orange': u'#FFA500', - u'orangered': u'#FF4500', - u'orchid': u'#DA70D6', - u'paleturquoise': u'#AFEEEE', - u'papayawhip': u'#FFEFD5', - u'peachpuff': u'#FFDAB9', - u'powderblue': u'#B0E0E6', - u'rosybrown': u'#BC8F8F', - u'royalblue': u'#4169E1', - u'saddlebrown': u'#8B4513', - u'sandybrown': u'#8B4513', - u'seashell': u'#FFF5EE', - u'sienna': u'#A0522D', - u'silver': u'#C0C0C0', - u'skyblue': u'#87CEEB', - u'slategrey': u'#708090', - u'snow': u'#FFFAFA', - u'springgreen': u'#00FF7F', - u'violet': u'#EE82EE', - u'yellowgreen': u'#9ACD32' + 'aliceblue': '#F0F8FF', + 'antiquewhite': '#FAEBD7', + 'aqua': '#00FFFF', + 'aquamarine': '#7FFFD4', + 'azure': '#F0FFFF', + 'beige': '#F5F5DC', + 'bisque': '#FFE4C4', + 'black': '#000000', + 'blanchedalmond': '#FFEBCD', + 'blue': '#0000FF', + 'brown': '#A52A2A', + 'burlywood': '#DEB887', + 'cadetblue': '#5F9EA0', + 'chartreuse': '#7FFF00', + 'chocolate': '#D2691E', + 'coral': '#FF7F50', + 'crimson': '#DC143C', + 'cyan': '#00FFFF', + 'darkblue': '#00008B', + 'darkgoldenrod': '#B8860B', + 'darkgreen': '#006400', + 'darkkhaki': '#BDB76B', + 'darkmagenta': '#8B008B', + 'darkolivegreen': '#556B2F', + 'darkorange': '#FF8C00', + 'darkorchid': '#9932CC', + 'darkred': '#8B0000', + 'darksalmon': '#E9967A', + 'darkslateblue': '#483D8B', + 'darkslategrey': '#2F4F4F', + 'darkviolet': '#9400D3', + 'deeppink': '#FF1493', + 'dodgerblue': '#1E90FF', + 'firebrick': '#B22222', + 'floralwhite': '#FFFAF0', + 'forestgreen': '#228B22', + 'fuchsia': '#FF00FF', + 'gainsboro': '#DCDCDC', + 'ghostwhite': '#F8F8FF', + 'gold': '#FFD700', + 'goldenrod': '#DAA520', + 'indianred ': '#CD5C5C', + 'indigo ': '#4B0082', + 'khaki': '#F0E68C', + 'lavenderblush': '#FFF0F5', + 'lawngreen': '#7CFC00', + 'lightblue': '#ADD8E6', + 'lightcoral': '#F08080', + 'lightgoldenrodyellow': '#FAFAD2', + 'lightgray': '#D3D3D3', + 'lightgrey': '#D3D3D3', + 'lightskyblue': '#87CEFA', + 'lightslategrey': '#778899', + 'lightsteelblue': '#B0C4DE', + 'lime': '#87CEFA', + 'linen': '#FAF0E6', + 'magenta': '#FF00FF', + 'maroon': '#800000', + 'mediumaquamarine': '#66CDAA', + 'mediumblue': '#0000CD', + 'mediumorchid': '#BA55D3', + 'mediumpurple': '#9370D8', + 'mediumseagreen': '#3CB371', + 'mediumslateblue': '#7B68EE', + 'midnightblue': '#191970', + 'moccasin': '#FFE4B5', + 'navajowhite': '#FFDEAD', + 'navy': '#000080', + 'oldlace': '#FDF5E6', + 'olive': '#808000', + 'orange': '#FFA500', + 'orangered': '#FF4500', + 'orchid': '#DA70D6', + 'paleturquoise': '#AFEEEE', + 'papayawhip': '#FFEFD5', + 'peachpuff': '#FFDAB9', + 'powderblue': '#B0E0E6', + 'rosybrown': '#BC8F8F', + 'royalblue': '#4169E1', + 'saddlebrown': '#8B4513', + 'sandybrown': '#8B4513', + 'seashell': '#FFF5EE', + 'sienna': '#A0522D', + 'silver': '#C0C0C0', + 'skyblue': '#87CEEB', + 'slategrey': '#708090', + 'snow': '#FFFAFA', + 'springgreen': '#00FF7F', + 'violet': '#EE82EE', + 'yellowgreen': '#9ACD32' } hex_pat = re.compile(r'#(\d{2})(\d{2})(\d{2})') diff --git a/src/calibre/ebooks/lrf/html/convert_from.py b/src/calibre/ebooks/lrf/html/convert_from.py index 41ec5cb6ce..be4feb2aeb 100644 --- a/src/calibre/ebooks/lrf/html/convert_from.py +++ b/src/calibre/ebooks/lrf/html/convert_from.py @@ -1,4 +1,5 @@ -from __future__ import print_function +from __future__ import absolute_import, division, print_function, unicode_literals + __license__ = 'GPL v3' __copyright__ = '2008, Kovid Goyal ' """ @@ -106,7 +107,7 @@ class HTMLConverter(object): re.IGNORECASE), lambda m: '
'), # Replace entities - (re.compile(u'&(\\S+?);'), partial(entity_to_unicode, + (re.compile(r'&(\S+?);'), partial(entity_to_unicode, exceptions=['lt', 'gt', 'amp', 'quot'])), # Remove comments from within style tags as they can mess up BeatifulSoup (re.compile(r'()', re.IGNORECASE|re.DOTALL), @@ -397,7 +398,7 @@ class HTMLConverter(object): def parse_css(self, style): """ Parse the contents of a