From 8298e497f5d4bb816d7e5ab5a5335bf0f9e7f3c7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 11 Aug 2010 09:45:22 -0600 Subject: [PATCH] ... --- resources/recipes/nspm.recipe | 17 ++++++++--------- src/calibre/libunrar.py | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/resources/recipes/nspm.recipe b/resources/recipes/nspm.recipe index 7514e0727d..13ff42b277 100644 --- a/resources/recipes/nspm.recipe +++ b/resources/recipes/nspm.recipe @@ -6,7 +6,6 @@ nspm.rs import re from calibre.web.feeds.news import BasicNewsRecipe -from calibre.ebooks.BeautifulSoup import Tag class Nspm(BasicNewsRecipe): title = 'Nova srpska politicka misao' @@ -22,14 +21,14 @@ class Nspm(BasicNewsRecipe): encoding = 'utf-8' language = 'sr' delay = 2 - publication_type = 'magazine' + publication_type = 'magazine' masthead_url = 'http://www.nspm.rs/templates/jsn_epic_pro/images/logol.jpg' - extra_css = """ @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} - @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} - body{font-family: "Times New Roman", serif1, serif} - .article_description{font-family: Arial, sans1, sans-serif} - img{margin-top:0.5em; margin-bottom: 0.7em} - .author{color: #990000; font-weight: bold} + extra_css = """ @font-face {font-family: "serif1";src:url(res:///opt/sony/ebook/FONT/tt0011m_.ttf)} + @font-face {font-family: "sans1";src:url(res:///opt/sony/ebook/FONT/tt0003m_.ttf)} + body{font-family: "Times New Roman", serif1, serif} + .article_description{font-family: Arial, sans1, sans-serif} + img{margin-top:0.5em; margin-bottom: 0.7em} + .author{color: #990000; font-weight: bold} .author,.createdate{font-size: 0.9em} """ conversion_options = { @@ -68,4 +67,4 @@ class Nspm(BasicNewsRecipe): def preprocess_html(self, soup): for item in soup.body.findAll(style=True): del item['style'] - return self.adeify_images(soup) \ No newline at end of file + return self.adeify_images(soup) diff --git a/src/calibre/libunrar.py b/src/calibre/libunrar.py index a71fd8718a..2f44dcdf4e 100644 --- a/src/calibre/libunrar.py +++ b/src/calibre/libunrar.py @@ -12,7 +12,7 @@ from ctypes import Structure as _Structure, c_char_p, c_uint, c_void_p, POINTER, from tempfile import NamedTemporaryFile from StringIO import StringIO -from calibre import iswindows, load_library, CurrentDir, prints +from calibre import iswindows, load_library, CurrentDir from calibre.ptempfile import TemporaryDirectory _librar_name = 'libunrar'