nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix English: "childs" into "children"

Browse source 
refs #1675
This commit is contained in:
Laurent Bachelier 2014-11-21 16:22:31 +01:00 • committed by Romain Bignon
commit 88df613a53
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/freemobile/pages/homepage.py
View file

@ -37,7 +37,7 @@ class HomePage(BadUTF8Page):
class item(ItemElement):
klass = Subscription
obj_subscriber = CleanText('div[@class="idAbonne pointer"]/p[1]', symbols='-', childs=False)
obj_subscriber = CleanText('div[@class="idAbonne pointer"]/p[1]', symbols='-', children=False)
obj_id = CleanText('div[@class="idAbonne pointer"]/p/span')
obj__login = GetID(Attr('.//div[@class="acceuil_btn"]/a', 'href'))
obj_label = Format(u'%s - %s', Field('id'), CleanText('//div[@class="forfaitChoisi"]'))

2
modules/logicimmo/pages.py
View file

@ -48,7 +48,7 @@ class CitiesPage(JsonPage):
class PhonePage(HTMLPage):
def get_phone(self):
return CleanText('//div[has-class("phone")]', childs=False)(self.doc)
return CleanText('//div[has-class("phone")]', children=False)(self.doc)
class HousingPage(HTMLPage):

2
modules/okc/browser.py
View file

@ -110,7 +110,7 @@ class OkCBrowser(Browser):
# return r['result']['flashs']
#@check_login
#def nb_godchilds(self):
#def nb_godchildren(self):
# r = self.api_request('member', 'view', data={'id': self.my_id})
# return int(r['result']['member']['popu']['invits'])

12
weboob/browser/filters/standard.py
View file

@ -317,29 +317,29 @@ class CleanText(Filter):
u'coucou\\ncoucou'
"""
def __init__(self, selector=None, symbols='', replace=[], childs=True, newlines=True, normalize='NFC', **kwargs):
def __init__(self, selector=None, symbols='', replace=[], children=True, newlines=True, normalize='NFC', **kwargs):
super(CleanText, self).__init__(selector, **kwargs)
self.symbols = symbols
self.toreplace = replace
self.childs = childs
self.children = children
self.newlines = newlines
self.normalize = normalize
@debug()
def filter(self, txt):
if isinstance(txt, (tuple, list)):
txt = u' '.join([self.clean(item, childs=self.childs) for item in txt])
txt = u' '.join([self.clean(item, children=self.children) for item in txt])
txt = self.clean(txt, self.childs, self.newlines, self.normalize)
txt = self.clean(txt, self.children, self.newlines, self.normalize)
txt = self.remove(txt, self.symbols)
txt = self.replace(txt, self.toreplace)
# ensure it didn't become str by mistake
return unicode(txt)
@classmethod
def clean(cls, txt, childs=True, newlines=True, normalize='NFC'):
def clean(cls, txt, children=True, newlines=True, normalize='NFC'):
if not isinstance(txt, basestring):
if childs:
if children:
txt = [t.strip() for t in txt.itertext()]
else:
txt = [txt.text.strip()]

4
weboob/tools/application/repl.py
View file

@ -464,11 +464,11 @@ class ReplApplication(Cmd, ConsoleApplication):
def path_completer(self, arg):
dirname = os.path.dirname(arg)
try:
childs = os.listdir(dirname or '.')
children = os.listdir(dirname or '.')
except OSError:
return ()
l = []
for child in childs:
for child in children:
path = os.path.join(dirname, child)
if os.path.isdir(path):
child += '/'