Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

PEP8 and make class selectors less brittle

Browse Source
This commit is contained in:
Kovid Goyal 2018-03-06 04:58:44 +05:30
parent 135e8489d1
commit 8cafad0107
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
recipes/granta.recipe
View File

@ -15,6 +15,8 @@ force_issue_download = None
################################################################## ##################################################################
# Adapted from https://gist.github.com/FlyingTopHat/7cfdd5434ec704916174 # Adapted from https://gist.github.com/FlyingTopHat/7cfdd5434ec704916174
def plus_with_unknown_component(first_comp, second_comp, result): def plus_with_unknown_component(first_comp, second_comp, result):
if result is None: if result is None:
return first_comp + second_comp return first_comp + second_comp
@ -45,11 +47,12 @@ def solve_captcha(captcha):
numeric_problem = numeric_problem + str(text2num(part)) numeric_problem = numeric_problem + str(text2num(part))
# Parse into parts # Parse into parts
pattern = re.compile(u'(?P<first_component>[0-9]+)?' pattern = re.compile(
+ u'\s*(?P<operator>[+×−])\s*' u'(?P<first_component>[0-9]+)?'
+ u'(?P<second_component>[0-9]+)' u'\s*(?P<operator>[+×−])\s*'
+ u'\s*(=)\s*' u'(?P<second_component>[0-9]+)'
+ u'(?P<result>[0-9]+)?', re.UNICODE) u'\s*(=)\s*'
u'(?P<result>[0-9]+)?', re.UNICODE)
calculationParts = re.search(pattern, numeric_problem) calculationParts = re.search(pattern, numeric_problem)
if calculationParts is None: if calculationParts is None:
@ -212,9 +215,8 @@ class Granta(BasicNewsRecipe):
articleHeader = soup.find( articleHeader = soup.find(
'div', attrs={'class': 'article-feature-image-container'}) 'div', attrs={'class': 'article-feature-image-container'})
if articleHeader is None: if articleHeader is None:
# This feels brittle, but bs3 demands a full match
articleHeader = soup.find( articleHeader = soup.find(
'div', attrs={'class': 'col-xs-12 col-sm-12 col-md-12 article-header'}) 'div', attrs={'class': lambda x: x and 'article-header' in x.split()})
if articleHeader is not None: if articleHeader is not None:
image = articleHeader.find( image = articleHeader.find(
'div', attrs={'class': 'article-feature-image'}) 'div', attrs={'class': 'article-feature-image'})
@ -238,7 +240,7 @@ class Granta(BasicNewsRecipe):
# Get latest issue # Get latest issue
issueInfo = soup.find( issueInfo = soup.find(
'div', attrs={'class': 'dnd_container dnd_container__heading'}) 'div', attrs={'class': lambda x: x and 'dnd_container__heading' in x.split()})
issueAnchor = issueInfo.find('a') issueAnchor = issueInfo.find('a')
issueTitle = issueAnchor.contents[0] issueTitle = issueAnchor.contents[0]