Fix English: "childs" into "children"

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

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()]

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 += '/'