Skip to content

Commit

Permalink
[FIX] tools: empty name
Browse files Browse the repository at this point in the history
Check if name isn't empty before executing regex. xlsxwriter can handle
an empty name.

opw-769163
Closes #18877
  • Loading branch information
adrienpeiffer authored and nim-odoo committed Aug 31, 2017
1 parent 65f5fc6 commit 0fff391
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions odoo/tools/misc.py
Expand Up @@ -372,11 +372,12 @@ class PatchedXlsxWorkbook(xlsxwriter.Workbook):


# TODO when xlsxwriter bump to 0.9.8, add worksheet_class=None parameter instead of kw # TODO when xlsxwriter bump to 0.9.8, add worksheet_class=None parameter instead of kw
def add_worksheet(self, name=None, **kw): def add_worksheet(self, name=None, **kw):
# invalid Excel character: []:*?/\ if name:
name = re.sub(r'[\[\]:*?/\\]', '', name) # invalid Excel character: []:*?/\
name = re.sub(r'[\[\]:*?/\\]', '', name)


# maximum size is 31 characters # maximum size is 31 characters
name = name[:31] name = name[:31]
return super(PatchedXlsxWorkbook, self).add_worksheet(name, **kw) return super(PatchedXlsxWorkbook, self).add_worksheet(name, **kw)


xlsxwriter.Workbook = PatchedXlsxWorkbook xlsxwriter.Workbook = PatchedXlsxWorkbook
Expand Down

0 comments on commit 0fff391

Please sign in to comment.