cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fixes for avoiding errors with Python3 / up-to-date libraries

Browse source
This commit is contained in:
Helmut Merz 2024-10-26 19:22:59 +02:00
parent 93a2acf7db
commit df1229d8fd
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cybertools/composer/schema/grid/field.py
View file

@ -167,7 +167,7 @@ class RecordsFieldInstance(GridFieldInstance):
def marshall(self, value): def marshall(self, value):
result = [] result = []
value = value or [] value = value or []
cardinality = getattr(self.context, 'cardinality', None) cardinality = getattr(self.context, 'cardinality', None) or 0
for row in value: for row in value:
item = {} item = {}
for fi in self.columnFieldInstances: for fi in self.columnFieldInstances:

2
cybertools/util/html.py
View file

@ -24,6 +24,8 @@ sentencePattern = re.compile(r'[:.\?\!]')
def sanitize(value, validTags=validTags, validAttrs=validAttrs, def sanitize(value, validTags=validTags, validAttrs=validAttrs,
validStyles=validStyles, stripEscapedComments=True): validStyles=validStyles, stripEscapedComments=True):
if value is None:
return ''
soup = BeautifulSoup(value, features='lxml') soup = BeautifulSoup(value, features='lxml')
for comment in soup.findAll(string=lambda text: isinstance(text, Comment)): for comment in soup.findAll(string=lambda text: isinstance(text, Comment)):
comment.extract() comment.extract()