diff --git a/fanficfare/adapters/adapter_archiveofourownorg.py b/fanficfare/adapters/adapter_archiveofourownorg.py index ba13fc9b..e1822703 100644 --- a/fanficfare/adapters/adapter_archiveofourownorg.py +++ b/fanficfare/adapters/adapter_archiveofourownorg.py @@ -442,7 +442,7 @@ class ArchiveOfOurOwnOrgAdapter(BaseSiteAdapter): ## sanity check just in case. self.use_full_work_soup = False self.full_work_soup = None - logger.warn("chapter count in view_full_work(%s) disagrees with num of chapters(%s)--ending use_view_full_work"%(len(self.full_work_chapters),self.num_chapters())) + logger.warning("chapter count in view_full_work(%s) disagrees with num of chapters(%s)--ending use_view_full_work"%(len(self.full_work_chapters),self.num_chapters())) whole_dl_soup = self.full_work_soup if whole_dl_soup: diff --git a/fanficfare/adapters/adapter_fanficsme.py b/fanficfare/adapters/adapter_fanficsme.py index 16e6209f..cac321db 100644 --- a/fanficfare/adapters/adapter_fanficsme.py +++ b/fanficfare/adapters/adapter_fanficsme.py @@ -331,7 +331,7 @@ class FanFicsMeAdapter(BaseSiteAdapter): chapter_div = whole_dl_soup.find('div',{'id':'c%s'%(index)}) if not chapter_div: self.use_full_work_soup = False - logger.warn("c%s not found in view_full_work--ending use_view_full_work"%(index)) + logger.warning("c%s not found in view_full_work--ending use_view_full_work"%(index)) if chapter_div == None: whole_dl_soup = self.make_soup(self._fetchUrl(url)) chapter_div = whole_dl_soup.find('div',{'id':'c%s'%(index)}) diff --git a/fanficfare/adapters/adapter_fanfictionnet.py b/fanficfare/adapters/adapter_fanfictionnet.py index c0451662..765b6ee4 100644 --- a/fanficfare/adapters/adapter_fanfictionnet.py +++ b/fanficfare/adapters/adapter_fanfictionnet.py @@ -143,7 +143,7 @@ class FanFictionNetSiteAdapter(BaseSiteAdapter): if e.code == 503: raise e except Exception as e: - logger.warn("Caught an exception reading URL: %s Exception %s."%(unicode(url),unicode(e))) + logger.warning("Caught an exception reading URL: %s Exception %s."%(unicode(url),unicode(e))) pass # Find authorid and URL from... author url. diff --git a/fanficfare/adapters/adapter_gravitytalescom.py b/fanficfare/adapters/adapter_gravitytalescom.py index 964f26f0..d55019de 100644 --- a/fanficfare/adapters/adapter_gravitytalescom.py +++ b/fanficfare/adapters/adapter_gravitytalescom.py @@ -34,7 +34,7 @@ except ImportError: # A version of feedparser is available in the Calibre plugin version from calibre.web.feeds import feedparser except ImportError: - # logger.warn('No version of feedparser module available, falling back to naive published and updated date') + # logger.warning('No version of feedparser module available, falling back to naive published and updated date') feedparser = None # py2 vs py3 transition diff --git a/fanficfare/adapters/adapter_silmarillionwritersguildorg.py b/fanficfare/adapters/adapter_silmarillionwritersguildorg.py index 0edf394f..c3a1414d 100644 --- a/fanficfare/adapters/adapter_silmarillionwritersguildorg.py +++ b/fanficfare/adapters/adapter_silmarillionwritersguildorg.py @@ -161,7 +161,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): # pages after story found. pass except Exception as e: - logger.warn("series parsing failed(%s)"%e) + logger.warning("series parsing failed(%s)"%e) pass # Find the chapters by regexing urls @@ -187,7 +187,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.addToList('characters',char.string) except Exception as e: - logger.warn("character parsing failed(%s)"%e) + logger.warning("character parsing failed(%s)"%e) #get warnings try: @@ -196,7 +196,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.addToList('warnings', warn.string) except Exception as e: - logger.warn("warning parsing failed(%s)"%e) + logger.warning("warning parsing failed(%s)"%e) #get genres try: @@ -205,7 +205,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.addToList('genre', genre.string) except Exception as e: - logger.warn("genre parsing failed(%s)"%e) + logger.warning("genre parsing failed(%s)"%e) # no convenient way to extract remaining metadata so bodge it by finding relevant identifier string and using next element as the data source @@ -220,7 +220,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): #logger.debug(summaryValue) self.setDescription(url,summaryValue) except Exception as e: - logger.warn("summary parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("summary parsing failed(%s) -- This can be caused by bad HTML in story description."%e) #get rating @@ -228,7 +228,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): rating = workDetails.find('strong',text='Rated:').next_sibling.string self.story.setMetadata('rating', rating) except Exception as e: - logger.warn("rating parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("rating parsing failed(%s) -- This can be caused by bad HTML in story description."%e) #get completion status and correct for consistency with other adapters try: @@ -240,14 +240,14 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.setMetadata('status', status) except Exception as e: - logger.warn("status parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("status parsing failed(%s) -- This can be caused by bad HTML in story description."%e) #get wordcount try: wordCount = workDetails.find('strong',text='Word count:').next_sibling.string self.story.setMetadata('numWords', wordCount) except Exception as e: - logger.warn("wordcount parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("wordcount parsing failed(%s) -- This can be caused by bad HTML in story description."%e) #get published date, this works for some reason yet doesn't without the spaces in it try: @@ -255,7 +255,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.setMetadata('datePublished', makeDate(datePublished, self.dateformat)) except Exception as e: - logger.warn("datePublished parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("datePublished parsing failed(%s) -- This can be caused by bad HTML in story description."%e) #get updated date try: @@ -263,7 +263,7 @@ class SilmarillionWritersGuildOrgAdapter(BaseSiteAdapter): self.story.setMetadata('dateUpdated', makeDate(dateUpdated, self.dateformat)) except Exception as e: - logger.warn("dateUpdated parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("dateUpdated parsing failed(%s) -- This can be caused by bad HTML in story description."%e) # grab the text for an individual chapter. def getChapterText(self, url): diff --git a/fanficfare/adapters/adapter_storiesofardacom.py b/fanficfare/adapters/adapter_storiesofardacom.py index 713eda22..3a9aa0f7 100644 --- a/fanficfare/adapters/adapter_storiesofardacom.py +++ b/fanficfare/adapters/adapter_storiesofardacom.py @@ -131,7 +131,7 @@ class StoriesOfArdaComAdapter(BaseSiteAdapter): self.story.setMetadata('status', td[2].string.split(': ')[1]) self.story.setMetadata('datePublished', makeDate(stripHTML(td[4]).split(': ')[1], self.dateformat)) except Exception as e: - logger.warn("rating, status and/or datePublished parsing failed(%s) -- This can be caused by bad HTML in story description."%e) + logger.warning("rating, status and/or datePublished parsing failed(%s) -- This can be caused by bad HTML in story description."%e) # grab the text for an individual chapter. def getChapterText(self, url): diff --git a/fanficfare/adapters/adapter_test1.py b/fanficfare/adapters/adapter_test1.py index 90b760b0..f5d0aad3 100644 --- a/fanficfare/adapters/adapter_test1.py +++ b/fanficfare/adapters/adapter_test1.py @@ -62,7 +62,7 @@ class TestSiteAdapter(BaseSiteAdapter): self.do_sleep() if idnum >= 1000: - logger.warn("storyId:%s - Custom INI data will be used."%idstr) + logger.warning("storyId:%s - Custom INI data will be used."%idstr) sections = ['teststory:%s'%idstr,'teststory:defaults'] #print("self.get_config_list(sections,'valid_entries'):%s"%self.get_config_list(sections,'valid_entries')) @@ -98,7 +98,7 @@ class TestSiteAdapter(BaseSiteAdapter): idnum = int(idstr) if idstr == '665' and not (self.is_adult or self.getConfig("is_adult")): - logger.warn("self.is_adult:%s"%self.is_adult) + logger.warning("self.is_adult:%s"%self.is_adult) raise exceptions.AdultCheckRequired(self.url) if idstr == '666': diff --git a/fanficfare/adapters/adapter_wattpadcom.py b/fanficfare/adapters/adapter_wattpadcom.py index a91415e5..bc06b056 100644 --- a/fanficfare/adapters/adapter_wattpadcom.py +++ b/fanficfare/adapters/adapter_wattpadcom.py @@ -49,7 +49,7 @@ class WattpadComAdapter(BaseSiteAdapter): try: WattpadComAdapter.CATEGORY_DEFs = json.loads(self._fetchUrl(WattpadComAdapter.API_GETCATEGORIES)) except: - logger.warn('API_GETCATEGORIES failed.') + logger.warning('API_GETCATEGORIES failed.') WattpadComAdapter.CATEGORY_DEFs = [] @staticmethod diff --git a/fanficfare/adapters/adapter_whoficcom.py b/fanficfare/adapters/adapter_whoficcom.py index 56dcf189..9e4429a8 100644 --- a/fanficfare/adapters/adapter_whoficcom.py +++ b/fanficfare/adapters/adapter_whoficcom.py @@ -140,7 +140,7 @@ class WhoficComSiteAdapter(BaseSiteAdapter): #