*: fix some problems reported by pylint

065902b8 · Jérome Perrin · Arnaud Fontaine · 76a87322 · 065902b8 · 065902b8
Commit 065902b8 authored Apr 09, 2024 by Jérome Perrin Committed by Arnaud Fontaine Jul 15, 2024
8 changed files
--- a/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.SimulatedDeliveryBuilder.py
+++ b/bt5/erp5_base/DocumentTemplateItem/portal_components/document.erp5.SimulatedDeliveryBuilder.py
@@ -99,7 +99,6 @@ class SimulatedDeliveryBuilder(BuilderMixin):
      Redefine this method, because it seems nothing interesting can be
      done before building Delivery.
    """
-    pass

  security.declarePrivate('searchMovementList')
  @UnrestrictedMethod

--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.EmailDocument.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.EmailDocument.py
@@ -48,10 +48,12 @@ except ImportError:
    not installed yet.
    """

-if six.PY2:
-  from email import message_from_string as message_from_bytes
-else:
+# pylint:disable=no-name-in-module
+if six.PY3:
  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


--- a/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.File.py
+++ b/product/ERP5/bootstrap/erp5_core/DocumentTemplateItem/portal_components/document.erp5.File.py
@@ -153,7 +153,7 @@ class File(Document, OFS_File):
  security.declarePrivate('update_data')
  def update_data(self, *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)

  security.declareProtected(Permissions.ModifyPortalContent,'setFile')

--- a/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.FolderWorkflowActionUtils.py
+++ b/product/ERP5/bootstrap/erp5_core/ExtensionTemplateItem/portal_components/extension.erp5.FolderWorkflowActionUtils.py
@@ -29,7 +29,6 @@

 import six

-from past.builtins import cmp
 from hashlib import md5

 # Some workflow does not make sense in the context of mass transition and are

--- a/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.BaseExtensibleTraversableMixin.py
+++ b/product/ERP5/bootstrap/erp5_core/MixinTemplateItem/portal_components/mixin.erp5.BaseExtensibleTraversableMixin.py
@@ -29,10 +29,12 @@

 from warnings import warn
 import six
+# pylint:disable=no-name-in-module
 if six.PY2:
  from base64 import decodestring as decodebytes
 else:
  from base64 import decodebytes
+# pylint:enable=no-name-in-module

 from zLOG import LOG
 from AccessControl import ClassSecurityInfo, getSecurityManager

--- a/product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementGroup.py
+++ b/product/ERP5/bootstrap/erp5_core/ModuleComponentTemplateItem/portal_components/module.erp5.MovementGroup.py
@@ -31,7 +31,6 @@
 from collections import OrderedDict
 from warnings import warn
 from Products.PythonScripts.Utility import allow_class
-from Products.ERP5Type.Utils import ensure_list


 class MovementGroupNode:

--- a/product/PortalTransforms/utils.py
+++ b/product/PortalTransforms/utils.py
@@ -4,11 +4,12 @@

 import io
 import six
-if six.PY2:
-    from email import message_from_string as message_from_bytes
-else:
+# pylint:disable=no-name-in-module
+if six.PY3:
    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):
    pass

--- a/product/Zelenium/generator.py
+++ b/product/Zelenium/generator.py
@@ -12,10 +12,12 @@ import glob
 import cgi
 from six.moves import urllib
 import multifile
-if six.PY2:
-    from email import message_from_file as message_from_bytes
-else:
+# pylint:disable=no-name-in-module
+if six.PY3:
    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 = """\
 <html>