Commit e9e33b40 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

py2/py3: use FileIO class instead of file class, that does not exist in Python 3.

parent a63769fb
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
import transaction import transaction
from io import FileIO
import os import os
class FileUpload(file): class FileUpload(FileIO):
"""Act as an uploaded file. """Act as an uploaded file.
""" """
__allow_access_to_unprotected_subobjects__ = 1 __allow_access_to_unprotected_subobjects__ = 1
def __init__(self, path, name): def __init__(self, path, name):
self.filename = name self.filename = name
file.__init__(self, path) super(FileUpload, self).__init__(path)
self.headers = {} self.headers = {}
......
...@@ -57,6 +57,11 @@ import pytz ...@@ -57,6 +57,11 @@ import pytz
import six import six
import lxml.html import lxml.html
if six.PY2:
FileIO = file
else:
from io import FileIO
def canonical_html(html): def canonical_html(html):
# type: (str) -> str # type: (str) -> str
...@@ -68,7 +73,7 @@ def canonical_html(html): ...@@ -68,7 +73,7 @@ def canonical_html(html):
).decode('utf-8') ).decode('utf-8')
class FileUpload(file): class FileUpload(FileIO):
"""Act as an uploaded file. """Act as an uploaded file.
""" """
__allow_access_to_unprotected_subobjects__ = 1 __allow_access_to_unprotected_subobjects__ = 1
...@@ -76,9 +81,10 @@ class FileUpload(file): ...@@ -76,9 +81,10 @@ class FileUpload(file):
if name is None: if name is None:
name = os.path.basename(path) name = os.path.basename(path)
self.filename = name self.filename = name
file.__init__(self, path) FileIO.__init__(self, path)
self.headers = {} self.headers = {}
# dummy objects # dummy objects
class DummyMailHostMixin(object): class DummyMailHostMixin(object):
"""Dummy Mail Host that doesn't really send messages and keep a copy in """Dummy Mail Host that doesn't really send messages and keep a copy in
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment