Sync to trunk.

resources/recipes/el_universal.recipe

@@ -94,7 +94,7 @@ class ElUniversal(BasicNewsRecipe):
              ,(u'Mexico'           , u'http://www.eluniversal.com.mx/rss/mexico.xml'       )
              ,(u'Estados'          , u'http://www.eluniversal.com.mx/rss/estados.xml'      )
              ,(u'Finanzas'         , u'http://www.eluniversal.com.mx/rss/finanzas.xml'     )
-             (u'Deportes'         , u'http://www.eluniversal.com.mx/rss/deportes.xml'     )
+             ,(u'Deportes'         , u'http://www.eluniversal.com.mx/rss/deportes.xml'     )
              ,(u'Espectaculos'     , u'http://www.eluniversal.com.mx/rss/espectaculos.xml' )
              ,(u'Cultura'          , u'http://www.eluniversal.com.mx/rss/cultura.xml'      )
              ,(u'Ciencia'          , u'http://www.eluniversal.com.mx/rss/ciencia.xml'      )

resources/recipes/ieco.recipe

@@ -0,0 +1,40 @@
+#!/usr/bin/env  python
+
+__license__   = 'GPL v3'
+__copyright__ = '2009, Darko Miletic <darko.miletic at gmail.com>'
+'''
+www.ieco.clarin.com
+'''
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class iEco(BasicNewsRecipe):
+    title                 = 'iEco Clarin'
+    __author__            = 'Darko Miletic'
+    description           = 'iEco, el suplemento economico de Clarin. Las ultimas noticias de Empresas y Negocios, Mercados y Finanzas, Economia y Tecnologia de la Argentina y el mundo.'
+    oldest_article        = 7
+    max_articles_per_feed = 100
+    no_stylesheets        = True
+    use_embedded_content  = False
+    encoding              = 'utf-8'
+    publisher             = 'Grupo Clarin'
+    category              = 'news, economia, mercados, bolsa de valores, finanzas, empresas, negocios, empleos, emprendedores, marketinguniversidades, tecnologia, agronegocios, noticias, informacion'
+    language              = 'es'
+    cover_url             = 'http://www.ieco.clarin.com/static2/images/Tapa-PDF.gif'
+    extra_css             = ' #bd{font-family: sans-serif} '
+
+    conversion_options = {
+                          'comment'   : description
+                        , 'tags'      : category
+                        , 'publisher' : publisher
+                        , 'author'    : publisher
+                        , 'language'  : language
+                        }
+
+    feeds = [(u'Articulos', u'http://www.ieco.clarin.com/rss/')]
+
+    keep_only_tags = [dict(name='div', attrs={'id':'bd'})]
+    remove_tags = [dict(name=['object','link'])]
+
+
+    def print_version(self, url):
+        return url + '?print=1'

src/calibre/ebooks/html/input.py

@@ -334,7 +334,6 @@ class HTMLInput(InputFormatPlugin):
         htmlfile_map = {}
         for f in filelist:
             path = f.path
-            print 111, path, repr(path), repr(os.path.dirname(path))
             oeb.container = DirContainer(os.path.dirname(path), log)
             bname = os.path.basename(path)
             id, href = oeb.manifest.generate(id='html',