Backup_Repos/FanFicFare
1
0
Fork 0
mirror of https://github.com/JimmXinu/FanFicFare.git synced 2026-05-05 19:11:50 +02:00
Code Issues Projects Releases Wiki Activity

fix deprecation warnings for invalid escapes

Browse source 
also fix ones that need to be switched from u'' to r'' +
unicode_literals
This commit is contained in:
Eli Schwartz 2020-07-09 19:14:07 -04:00 committed by Jim Miller
parent 49c9ea9837
commit fc8efd457e
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
fanficfare/adapters/adapter_masseffect2in.py
View file

@ -61,8 +61,8 @@ class MassEffect2InAdapter(BaseSiteAdapter):
3) editor signatures an an option to remove them.
"""
WORD_PATTERN = re.compile(u'\w+', re.UNICODE)
DOCUMENT_ID_PATTERN = re.compile(u'\d+-\d+-\d+-\d+')
WORD_PATTERN = re.compile(r'\w+', re.UNICODE)
DOCUMENT_ID_PATTERN = re.compile(r'\d+-\d+-\d+-\d+')
SITE_LANGUAGE = u'Russian'
def __init__(self, config, url):
@ -145,7 +145,7 @@ class MassEffect2InAdapter(BaseSiteAdapter):
largestCommonPrefix = _getLargestCommonPrefix(*headings)
prefixLength = len(largestCommonPrefix)
storyTitleEnd, chapterTitleStart = prefixLength, prefixLength
match = re.search(u'[:.\s]*(?P<chapter>глава\s+)?$', largestCommonPrefix, re.IGNORECASE | re.UNICODE)
match = re.search(r'[:.\s]*(?P<chapter>глава\s+)?$', largestCommonPrefix, re.IGNORECASE | re.UNICODE)
if match:
storyTitleEnd -= len(match.group())
label = match.group('chapter')
@ -154,7 +154,7 @@ class MassEffect2InAdapter(BaseSiteAdapter):
storyTitle = largestCommonPrefix[:storyTitleEnd]
self.story.setMetadata('title', storyTitle)
garbagePattern = re.compile(u'(?P<start>^)?[:.\s]*(?(start)|$)', re.UNICODE)
garbagePattern = re.compile(r'(?P<start>^)?[:.\s]*(?(start)|$)', re.UNICODE)
for chapter in chapters:
url = chapter.getUrl()
@ -383,7 +383,7 @@ class Chapter(object):
optimum, zero inhibits the check, and positive value adjusts threshold."""
def getFirstWord(string):
match = re.search(u'^\s*\w+', string, re.UNICODE)
match = re.search(r'^\s*\w+', string, re.UNICODE)
return string[match.start():match.end()]
thisStoryTitle = self.getHeading()
@ -430,7 +430,7 @@ class Chapter(object):
.findNextSibling('a')
except AttributeError:
raise ParsingError(u'Failed to locate author link.')
match = re.search(u'(8-\d+)', authorLink['onclick'])
match = re.search(r'(8-\d+)', authorLink['onclick'])
if not match:
raise ParsingError(u'Failed to extract author ID.')
authorId = match.group(0)
@ -562,7 +562,7 @@ class Chapter(object):
return attributes
# Most, but not all, URLs of rating icons match this.
RATING_LABEL_PATTERN = re.compile(u'/(?P<rating>[ERATINnG]+)\.png$')
RATING_LABEL_PATTERN = re.compile(r'/(?P<rating>[ERATINnG]+)\.png$')
def _parseRatingFromImage(self, element):
"""Given an image element, try to parse story rating from it."""
@ -594,7 +594,7 @@ class Chapter(object):
# Various `et cetera' and `et al' forms in Russian texts.
# Intended to be used with whole strings!
ETC_PATTERN = re.compile(
u'''[и&]\s(?:
r'''[и&]\s(?:
(?:т\.?\s?[пд]?\.?)|
(?:др(?:угие|\.)?)|
(?:пр(?:очие|\.)?)|
@ -606,7 +606,7 @@ class Chapter(object):
re.IGNORECASE + re.UNICODE + re.VERBOSE)
# `Author's Notes' and its variants in Russian.
ANNOTATION_PATTERN = re.compile(u'аннотация|описание|(?:(?:за|при)мечание\s)?(?:от\s)?автора', re.UNICODE)
ANNOTATION_PATTERN = re.compile(r'аннотация|описание|(?:(?:за|при)мечание\s)?(?:от\s)?автора', re.UNICODE)
def _parseAttribute(self, key, value):
"""
@ -686,7 +686,7 @@ class Chapter(object):
return root
# Editor signature always starts with something like this.
SIGNED_PATTERN = re.compile(u'отредактирова(?:но|ла?)[:.\s]', re.IGNORECASE + re.UNICODE)
SIGNED_PATTERN = re.compile(r'отредактирова(?:но|ла?)[:.\s]', re.IGNORECASE + re.UNICODE)
def _excludeEditorSignature(self, root):
"""Exclude editor signature from within `root' element."""

2
fanficfare/adapters/adapter_wattpadcom.py
View file

@ -137,7 +137,7 @@ class WattpadComAdapter(BaseSiteAdapter):
def getChapterText(self, url):
logger.debug('%s' % url)
chapterID = re.search(u'https://www.wattpad.com/(?P<chapterID>\d+).*', url).group('chapterID')
chapterID = re.search(r'https://www.wattpad.com/(?P<chapterID>\d+).*', url).group('chapterID')
return self.utf8FromSoup(url,self.make_soup(self._fetchUrl(WattpadComAdapter.API_STORYTEXT % chapterID)))
# adapter self-dicovery is not implemented in fanficfare (it existed for the previous project)