Commit 065902b8 authored by Jérome Perrin's avatar Jérome Perrin Committed by Arnaud Fontaine

*: fix some problems reported by pylint

parent 76a87322
...@@ -99,7 +99,6 @@ class SimulatedDeliveryBuilder(BuilderMixin): ...@@ -99,7 +99,6 @@ class SimulatedDeliveryBuilder(BuilderMixin):
Redefine this method, because it seems nothing interesting can be Redefine this method, because it seems nothing interesting can be
done before building Delivery. done before building Delivery.
""" """
pass
security.declarePrivate('searchMovementList') security.declarePrivate('searchMovementList')
@UnrestrictedMethod @UnrestrictedMethod
......
...@@ -48,10 +48,12 @@ except ImportError: ...@@ -48,10 +48,12 @@ except ImportError:
not installed yet. not installed yet.
""" """
if six.PY2: # pylint:disable=no-name-in-module
from email import message_from_string as message_from_bytes if six.PY3:
else:
from email import message_from_bytes from email import message_from_bytes
else:
from email import message_from_string as message_from_bytes
# pylint:enable=no-name-in-module
from email.utils import parsedate_tz, mktime_tz from email.utils import parsedate_tz, mktime_tz
......
...@@ -153,7 +153,7 @@ class File(Document, OFS_File): ...@@ -153,7 +153,7 @@ class File(Document, OFS_File):
security.declarePrivate('update_data') security.declarePrivate('update_data')
def update_data(self, *args, **kw): def update_data(self, *args, **kw):
super(File, self).update_data(*args, **kw) super(File, self).update_data(*args, **kw)
if six.PY2 and isinstance(self.size, long): if six.PY2 and isinstance(self.size, long): # pylint:disable=undefined-variable
self.size = int(self.size) self.size = int(self.size)
security.declareProtected(Permissions.ModifyPortalContent,'setFile') security.declareProtected(Permissions.ModifyPortalContent,'setFile')
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
import six import six
from past.builtins import cmp
from hashlib import md5 from hashlib import md5
# Some workflow does not make sense in the context of mass transition and are # Some workflow does not make sense in the context of mass transition and are
......
...@@ -29,10 +29,12 @@ ...@@ -29,10 +29,12 @@
from warnings import warn from warnings import warn
import six import six
# pylint:disable=no-name-in-module
if six.PY2: if six.PY2:
from base64 import decodestring as decodebytes from base64 import decodestring as decodebytes
else: else:
from base64 import decodebytes from base64 import decodebytes
# pylint:enable=no-name-in-module
from zLOG import LOG from zLOG import LOG
from AccessControl import ClassSecurityInfo, getSecurityManager from AccessControl import ClassSecurityInfo, getSecurityManager
......
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
from collections import OrderedDict from collections import OrderedDict
from warnings import warn from warnings import warn
from Products.PythonScripts.Utility import allow_class from Products.PythonScripts.Utility import allow_class
from Products.ERP5Type.Utils import ensure_list
class MovementGroupNode: class MovementGroupNode:
......
...@@ -4,11 +4,12 @@ ...@@ -4,11 +4,12 @@
import io import io
import six import six
if six.PY2: # pylint:disable=no-name-in-module
from email import message_from_string as message_from_bytes if six.PY3:
else:
from email import message_from_bytes from email import message_from_bytes
else:
from email import message_from_string as message_from_bytes
# pylint:enable=no-name-in-module
class TransformException(Exception): class TransformException(Exception):
pass pass
......
...@@ -12,10 +12,12 @@ import glob ...@@ -12,10 +12,12 @@ import glob
import cgi import cgi
from six.moves import urllib from six.moves import urllib
import multifile import multifile
if six.PY2: # pylint:disable=no-name-in-module
from email import message_from_file as message_from_bytes if six.PY3:
else:
from email import message_from_bytes from email import message_from_bytes
else:
from email import message_from_string as message_from_bytes
# pylint:enable=no-name-in-module
_TEST_CASE_HEADER = """\ _TEST_CASE_HEADER = """\
<html> <html>
......
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