mirror of
https://github.com/pretix/pretix.git
synced 2026-09-14 16:24:43 +00:00
Compatibility with new openpyxl
This commit is contained in:
@@ -128,7 +128,7 @@ class ListExporter(BaseExporter):
|
|||||||
|
|
||||||
def _render_xlsx(self, form_data, output_file=None):
|
def _render_xlsx(self, form_data, output_file=None):
|
||||||
wb = Workbook()
|
wb = Workbook()
|
||||||
ws = wb.get_active_sheet()
|
ws = wb.active
|
||||||
try:
|
try:
|
||||||
ws.title = str(self.verbose_name)
|
ws.title = str(self.verbose_name)
|
||||||
except:
|
except:
|
||||||
@@ -207,7 +207,7 @@ class MultiSheetListExporter(ListExporter):
|
|||||||
|
|
||||||
def _render_xlsx(self, form_data, output_file=None):
|
def _render_xlsx(self, form_data, output_file=None):
|
||||||
wb = Workbook()
|
wb = Workbook()
|
||||||
ws = wb.get_active_sheet()
|
ws = wb.active
|
||||||
wb.remove(ws)
|
wb.remove(ws)
|
||||||
for s, l in self.sheets:
|
for s, l in self.sheets:
|
||||||
ws = wb.create_sheet(str(l))
|
ws = wb.create_sheet(str(l))
|
||||||
|
|||||||
@@ -37,7 +37,7 @@ babel
|
|||||||
django-i18nfield>=1.4.0
|
django-i18nfield>=1.4.0
|
||||||
django-hijack>=2.1.10,<2.2.0
|
django-hijack>=2.1.10,<2.2.0
|
||||||
jsonschema
|
jsonschema
|
||||||
openpyxl
|
openpyxl==3.0.*
|
||||||
django-oauth-toolkit==1.2.*
|
django-oauth-toolkit==1.2.*
|
||||||
oauthlib==3.1.*
|
oauthlib==3.1.*
|
||||||
django-jsonfallback>=2.1.2
|
django-jsonfallback>=2.1.2
|
||||||
|
|||||||
+1
-1
@@ -143,7 +143,7 @@ setup(
|
|||||||
'django-localflavor',
|
'django-localflavor',
|
||||||
'jsonschema',
|
'jsonschema',
|
||||||
'django-hijack>=2.1.10,<2.2.0',
|
'django-hijack>=2.1.10,<2.2.0',
|
||||||
'openpyxl',
|
'openpyxl==3.0.*',
|
||||||
'django-oauth-toolkit==1.2.*',
|
'django-oauth-toolkit==1.2.*',
|
||||||
'oauthlib==3.1.*',
|
'oauthlib==3.1.*',
|
||||||
'urllib3==1.24.*', # required by current requests
|
'urllib3==1.24.*', # required by current requests
|
||||||
|
|||||||
Reference in New Issue
Block a user