From a0073005e42537d3e3cd38ddfe9b3abe1c6b55b7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 26 Nov 2008 17:41:43 -0800 Subject: [PATCH] Add fix for locale problems (forgot to commit in previous release) --- src/calibre/web/feeds/recipes/b92.py | 22 --------------------- src/calibre/web/feeds/recipes/blic.py | 22 --------------------- src/calibre/web/feeds/recipes/danas.py | 22 --------------------- src/calibre/web/feeds/recipes/novosti.py | 23 ---------------------- src/calibre/web/feeds/recipes/politika.py | 23 ---------------------- src/calibre/web/feeds/recipes/vreme.py | 24 +---------------------- 6 files changed, 1 insertion(+), 135 deletions(-) diff --git a/src/calibre/web/feeds/recipes/b92.py b/src/calibre/web/feeds/recipes/b92.py index 21c29d9a16..40496b0ef1 100644 --- a/src/calibre/web/feeds/recipes/b92.py +++ b/src/calibre/web/feeds/recipes/b92.py @@ -16,28 +16,6 @@ class B92(BasicNewsRecipe): max_articles_per_feed = 100 no_stylesheets = True use_embedded_content = False -# #Locale setting to get appropriate date/month values in Serbian if possible -# try: -# #Windows seting for locale -# locale.setlocale(locale.LC_TIME,'Serbian (Latin)') -# except locale.Error: -# #Linux setting for locale -- choose one appropriate for your distribution -# try: -# locale.setlocale(locale.LC_TIME,'sr_YU') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_CS@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_RS') -# except locale.Error: -# locale.setlocale(locale.LC_TIME,'C') remove_tags_after = dict(name='div', attrs={'class':'gas'}) remove_tags = [ diff --git a/src/calibre/web/feeds/recipes/blic.py b/src/calibre/web/feeds/recipes/blic.py index eae29276ab..02683e7f88 100644 --- a/src/calibre/web/feeds/recipes/blic.py +++ b/src/calibre/web/feeds/recipes/blic.py @@ -17,28 +17,6 @@ class Blic(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False timefmt = ' [%A, %d %B, %Y]' -# #Locale setting to get appropriate date/month values in Serbian if possible -# try: -# #Windows seting for locale -# locale.setlocale(locale.LC_TIME,'Serbian (Latin)') -# except locale.Error: -# #Linux setting for locale -- choose one appropriate for your distribution -# try: -# locale.setlocale(locale.LC_TIME,'sr_YU') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_CS@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_RS') -# except locale.Error: -# locale.setlocale(locale.LC_TIME,'C') keep_only_tags = [ dict(name='div', attrs={'class':'single_news'}) ] diff --git a/src/calibre/web/feeds/recipes/danas.py b/src/calibre/web/feeds/recipes/danas.py index ba7e406d90..0d5839e9d3 100644 --- a/src/calibre/web/feeds/recipes/danas.py +++ b/src/calibre/web/feeds/recipes/danas.py @@ -17,28 +17,6 @@ class Danas(BasicNewsRecipe): no_stylesheets = False use_embedded_content = False timefmt = ' [%A, %d %B, %Y]' -# #Locale setting to get appropriate date/month values in Serbian if possible -# try: -# #Windows seting for locale -# locale.setlocale(locale.LC_TIME,'Serbian (Latin)') -# except locale.Error: -# #Linux setting for locale -- choose one appropriate for your distribution -# try: -# locale.setlocale(locale.LC_TIME,'sr_YU') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_CS@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_RS') -# except locale.Error: -# locale.setlocale(locale.LC_TIME,'C') keep_only_tags = [ dict(name='div', attrs={'id':'left'}) ] remove_tags_after = dict(name='div', attrs={'id':'comments'}) diff --git a/src/calibre/web/feeds/recipes/novosti.py b/src/calibre/web/feeds/recipes/novosti.py index 12882905d4..e0b2b47352 100644 --- a/src/calibre/web/feeds/recipes/novosti.py +++ b/src/calibre/web/feeds/recipes/novosti.py @@ -17,29 +17,6 @@ class Novosti(BasicNewsRecipe): no_stylesheets = True use_embedded_content = False timefmt = ' [%A, %d %B, %Y]' -# #Locale setting to get appropriate date/month values in Serbian if possible -# try: -# #Windows seting for locale -# locale.setlocale(locale.LC_TIME,'Serbian (Latin)') -# except locale.Error: -# #Linux setting for locale -- choose one appropriate for your distribution -# try: -# locale.setlocale(locale.LC_TIME,'sr_YU') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_CS@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr@Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_Latn') -# except locale.Error: -# try: -# locale.setlocale(locale.LC_TIME,'sr_RS') -# except locale.Error: -# locale.setlocale(locale.LC_TIME,'C') - keep_only_tags = [ dict(name='div', attrs={'class':'jednaVest'}) ] remove_tags_after = dict(name='div', attrs={'class':'info_bottom'}) diff --git a/src/calibre/web/feeds/recipes/politika.py b/src/calibre/web/feeds/recipes/politika.py index d2dd52a2fb..fc2bc24abc 100644 --- a/src/calibre/web/feeds/recipes/politika.py +++ b/src/calibre/web/feeds/recipes/politika.py @@ -18,29 +18,6 @@ class Politika(BasicNewsRecipe): extra_css = '.content_center_border {text-align: left;}' use_embedded_content = False timefmt = ' [%A, %d %B, %Y]' - #Locale setting to get appropriate date/month values in Serbian if possible - try: - #Windows seting for locale - locale.setlocale(locale.LC_TIME,'Serbian (Latin)') - except locale.Error: - #Linux setting for locale -- choose one appropriate for your distribution - try: - locale.setlocale(locale.LC_TIME,'sr_YU') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_CS@Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr@Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_RS') - except locale.Error: - locale.setlocale(locale.LC_TIME,'C') - remove_tags_before = dict(name='div', attrs={'class':'content_center_border'}) remove_tags_after = dict(name='div', attrs={'class':'datum_item_details'}) diff --git a/src/calibre/web/feeds/recipes/vreme.py b/src/calibre/web/feeds/recipes/vreme.py index 411562f010..9c9bab4c60 100644 --- a/src/calibre/web/feeds/recipes/vreme.py +++ b/src/calibre/web/feeds/recipes/vreme.py @@ -23,28 +23,6 @@ class Vreme(BasicNewsRecipe): needs_subscription = True INDEX = 'http://www.vreme.com' LOGIN = 'http://www.vreme.com/account/index.php' - #Locale setting to get appropriate date/month values in Serbian if possible - try: - #Windows seting for locale - locale.setlocale(locale.LC_TIME,'Serbian (Latin)') - except locale.Error: - #Linux setting for locale -- choose one appropriate for your distribution - try: - locale.setlocale(locale.LC_TIME,'sr_YU') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_CS@Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr@Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_Latn') - except locale.Error: - try: - locale.setlocale(locale.LC_TIME,'sr_RS') - except locale.Error: - locale.setlocale(locale.LC_TIME,'C') def get_browser(self): br = BasicNewsRecipe.get_browser() @@ -73,4 +51,4 @@ class Vreme(BasicNewsRecipe): 'url':url, 'description':description }) - return [(soup.head.title.string, articles)] \ No newline at end of file + return [(soup.head.title.string, articles)]