From 980388f2bde3d4cb4b07673cb9e79c951aabd867 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 19 Sep 2010 09:48:39 -0600
Subject: [PATCH 1/2] Le Journal de Montreal by Luciano Furtado. Fixes #405
 (New news feed)

---
 resources/recipes/le_journal.recipe | 43 +++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 resources/recipes/le_journal.recipe

diff --git a/resources/recipes/le_journal.recipe b/resources/recipes/le_journal.recipe
new file mode 100644
index 0000000000..24a7d52164
--- /dev/null
+++ b/resources/recipes/le_journal.recipe
@@ -0,0 +1,43 @@
+__author__ = ' (lrfurtado@yahoo.com.br)'
+
+from calibre.web.feeds.news import BasicNewsRecipe
+
+class LeJournalDeMontrealRecipe(BasicNewsRecipe):
+
+     title       = u'Le Journal de Montreal'
+     description = u'Le Journal de Montreal'
+     __author__  = 'Luciano Furtado'
+     language = 'fr'
+
+     oldest_article = 7
+     use_embedded_content=0
+     max_articles_per_feed = 15
+
+     remove_tags = [
+                        dict(name='ul',attrs={'id':'mainNav'}),
+                        dict(name='div',attrs={'id':'boxPolitique'}),
+                        dict(name='div',attrs={'id':'boxScoop'}),
+                        dict(name='div',attrs={'id':'DossierSpec'}),
+                        dict(name='div',attrs={'id':'channelBoxes'}),
+                        dict(name='div',attrs={'id':'sectionBoxes'}),
+                        dict(name='div',attrs={'id':'header'}),
+                        dict(name='div',attrs={'id':'footer'}),
+ dict(name='div',attrs={'id':'navbarCanoe_container'}),
+                        dict(name='div',attrs={'id':'popularCanoe'}),
+                        dict(name='div',attrs={'id':'textAds'}),
+                        dict(name='div',attrs={'id':'24heures'}),
+                        dict(name='div',attrs={'class':'bottomBox clear'}),
+                        dict(name='div',attrs={'class':'articleControls thin'}),
+                  ]
+
+
+     feeds          = [
+                        (u'Actualites',
+ u'http://www.canoe.com/rss/feed/nouvelles/ljm_actualites.xml'),
+                        (u'Arts et spectacle',
+ u'http://www.canoe.com/rss/feed/nouvelles/ljm_arts.xml'),
+                        (u'Sports',
+ u'http://www.canoe.com/rss/feed/nouvelles/ljm_sports.xml'),
+                        (u'Chroniques',
+ u'http://www.canoe.com/rss/feed/nouvelles/ljm_chroniques.xml'),
+                     ]

From 23cd4fd7833180d7036aa77c0c1efcbd09ca6a00 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 19 Sep 2010 10:16:41 -0600
Subject: [PATCH 2/2] Content server: Making serving of large files more
 efficient.

---
 src/calibre/library/server/content.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/library/server/content.py b/src/calibre/library/server/content.py
index 95794a8c1d..aeba8a3218 100644
--- a/src/calibre/library/server/content.py
+++ b/src/calibre/library/server/content.py
@@ -184,7 +184,7 @@ class ContentServer(object):
         if path and os.path.exists(path):
             updated = fromtimestamp(os.stat(path).st_mtime)
             cherrypy.response.headers['Last-Modified'] = self.last_modified(updated)
-        return fmt.read()
+        return fmt
     # }}}