misc: fix pylint arguments-renamed (#55264)

pylint.rc

@@ -8,7 +8,6 @@ cache-size=500
 disable=
     abstract-method,
     arguments-differ,
-    arguments-renamed,
     attribute-defined-outside-init,
     broad-except,
     consider-using-dict-comprehension,

wcs/backoffice/management.py

@@ -147,9 +147,9 @@ class SendCodeFormdefDirectory(Directory):
     def __init__(self, formdef):
         self.formdef = formdef
 
-    def _q_lookup(self, formdata_id):
+    def _q_lookup(self, component):
         html_top('management', _('Management'))
-        formdata = self.formdef.data_class().get(formdata_id)
+        formdata = self.formdef.data_class().get(component)
 
         submitter_email = formdata.formdef.get_submitter_email(formdata)
         mail_subject = EmailsDirectory.get_subject('tracking-code-reminder')

wcs/blocks.py

@@ -51,13 +51,13 @@ class BlockDef(StorableObject):
         self.name = name
         self.fields = []
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         if self.slug is None:
             # set slug if it's not yet there
             self.slug = self.get_new_slug()
 
-        super().store()
+        super().store(*args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)
 

wcs/data_sources.py

@@ -538,12 +538,12 @@ class NamedDataSource(XmlStorableObject):
         if changed:
             self.store()
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         if self.slug is None:
             # set slug if it's not yet there
             self.slug = self.get_new_slug()
-        super().store()
+        super().store(*args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)
 

wcs/fields.py

@@ -1089,8 +1089,8 @@ class StringField(WidgetField):
             changed = True
         return changed
 
-    def init_with_xml(self, element, charset, include_id=False, snapshot=False):
-        super().init_with_xml(element, charset, include_id=include_id)
+    def init_with_xml(self, elem, charset, include_id=False, snapshot=False):
+        super().init_with_xml(elem, charset, include_id=include_id)
         self.migrate()
 
 
@@ -1455,8 +1455,8 @@ class FileField(WidgetField):
         node.text = od_clean_text(force_text(value))
         return node
 
-    def get_csv_value(self, value, **kwargs):
-        return [str(value) if value else '']
+    def get_csv_value(self, element, **kwargs):
+        return [str(element) if element else '']
 
     def get_json_value(self, value, formdata=None, include_file_content=True, **kwargs):
         out = value.get_json_value(include_file_content=include_file_content)
@@ -1528,8 +1528,8 @@ class FileField(WidgetField):
             self.document_type['mimetypes'] = old_value
         return result
 
-    def init_with_xml(self, element, charset, include_id=False, snapshot=False):
-        super().init_with_xml(element, charset, include_id=include_id)
+    def init_with_xml(self, elem, charset, include_id=False, snapshot=False):
+        super().init_with_xml(elem, charset, include_id=include_id)
         # translate fields flattened to strings
         if self.document_type and self.document_type.get('mimetypes'):
             self.document_type['mimetypes'] = self.document_type['mimetypes'].split('|')
@@ -1843,9 +1843,9 @@ class ItemField(WidgetField, MapOptionsMixin, ItemFieldMixin):
             changed = True
         return changed
 
-    def init_with_xml(self, element, charset, include_id=False, snapshot=False):
-        super().init_with_xml(element, charset, include_id=include_id)
-        if getattr(element.find('show_as_radio'), 'text', None) == 'True':
+    def init_with_xml(self, elem, charset, include_id=False, snapshot=False):
+        super().init_with_xml(elem, charset, include_id=include_id)
+        if getattr(elem.find('show_as_radio'), 'text', None) == 'True':
             self.display_mode = 'radio'
 
     @property
@@ -2149,8 +2149,8 @@ class ItemField(WidgetField, MapOptionsMixin, ItemFieldMixin):
             return ['%s (%s)' % (self.label, _('identifier')), self.label]
         return [self.label]
 
-    def get_csv_value(self, value, display_value=None, **kwargs):
-        values = [value]
+    def get_csv_value(self, element, display_value=None, **kwargs):
+        values = [element]
         if self.data_source:
             values.append(display_value)
         return values
@@ -2334,9 +2334,9 @@ class ItemsField(WidgetField, ItemFieldMixin):
             labels.extend([''] * (len(self.get_options()) - 1))
         return labels
 
-    def get_csv_value(self, value, **kwargs):
+    def get_csv_value(self, element, **kwargs):
         values = []
-        for one_value in value:
+        for one_value in element:
             values.append(one_value)
         if self.max_choices:
             nb_columns = self.max_choices
@@ -2734,14 +2734,14 @@ class TableField(WidgetField):
                     labels.append(t)
         return labels
 
-    def get_csv_value(self, value, **kwargs):
+    def get_csv_value(self, element, **kwargs):
         if not self.columns:
             return ['']
         values = []
         for i in range(len(self.columns)):
             for j in range(len(self.rows)):
                 try:
-                    values.append(value[j][i])
+                    values.append(element[j][i])
                 except IndexError:
                     values.append('')
         return values
@@ -3141,12 +3141,12 @@ class RankedItemsField(WidgetField):
             return [self.label]
         return [self.label] + [''] * (len(self.items) - 1)
 
-    def get_csv_value(self, value, **kwargs):
+    def get_csv_value(self, element, **kwargs):
         if not self.items:
             return ['']
-        if not isinstance(value, dict):
-            value = {}
-        items = [x for x in value.items() if x[1] is not None]
+        if not isinstance(element, dict):
+            element = {}
+        items = [x for x in element.items() if x[1] is not None]
         items.sort(key=lambda x: x[1])
         ranked = [x[0] for x in items]
         return ranked + ['' for x in range(len(self.items) - len(ranked))]
@@ -3247,8 +3247,8 @@ class PasswordField(WidgetField):
     def get_view_value(self, value, **kwargs):
         return '●' * 8
 
-    def get_csv_value(self, value, **kwargs):
-        return [self.get_view_value(value)]
+    def get_csv_value(self, element, **kwargs):
+        return [self.get_view_value(element)]
 
     def get_rst_view_value(self, value, indent=''):
         return indent + self.get_view_value(value)
@@ -3376,11 +3376,11 @@ class BlockField(WidgetField):
         headings = ['%s - %s' % (self.label, x + 1) for x in range(nb_items)]
         return headings
 
-    def get_csv_value(self, value, **kwargs):
+    def get_csv_value(self, element, **kwargs):
         nb_items = self.max_items or 1
         cells = [''] * nb_items
-        if value and value.get('data'):
-            for i, subvalue in enumerate(value.get('data')[:nb_items]):
+        if element and element.get('data'):
+            for i, subvalue in enumerate(element.get('data')[:nb_items]):
                 if subvalue:
                     cells[i] = self.block.get_display_value(subvalue)
         return cells

wcs/formdef.py

@@ -391,7 +391,7 @@ class FormDef(StorableObject):
 
         sql.formdef_wipe()
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         if self.url_name is None:
             # set url name if it's not yet there
@@ -405,7 +405,7 @@ class FormDef(StorableObject):
             # or if there are not yet any submitted forms
             if self.id is None or self.data_class().count() == 0:
                 self.internal_identifier = new_internal_identifier
-        StorableObject.store(self)
+        StorableObject.store(self, *args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)
         if get_publisher().is_using_postgresql():

wcs/mail_templates.py

@@ -49,12 +49,12 @@ class MailTemplate(XmlStorableObject):
         base_url = get_publisher().get_backoffice_url()
         return '%s/workflows/mail-templates/%s/' % (base_url, self.id)
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         if self.slug is None:
             # set slug if it's not yet there
             self.slug = self.get_new_slug()
-        super().store()
+        super().store(*args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)
 

wcs/qommon/misc.py

@@ -569,43 +569,43 @@ def preprocess_struct_time(obj):
 
 
 class JSONEncoder(json.JSONEncoder):
-    def encode(self, obj):
-        return super().encode(preprocess_struct_time(obj))
+    def encode(self, o):
+        return super().encode(preprocess_struct_time(o))
 
-    def default(self, obj):
+    def default(self, o):
         # make sure time.struct_time are not received as they do have a
         # default serializer in Python 3 (they are tuples) and should
         # be converted to datetime objects beforehand.
-        assert not isinstance(obj, time.struct_time), 'time.struct_time should not be serialized'
+        assert not isinstance(o, time.struct_time), 'time.struct_time should not be serialized'
 
-        if isinstance(obj, datetime.datetime):
-            return obj.isoformat()
+        if isinstance(o, datetime.datetime):
+            return o.isoformat()
 
-        if isinstance(obj, datetime.date):
-            return obj.strftime('%Y-%m-%d')
+        if isinstance(o, datetime.date):
+            return o.strftime('%Y-%m-%d')
 
-        if isinstance(obj, decimal.Decimal):
-            return localize(obj)
+        if isinstance(o, decimal.Decimal):
+            return localize(o)
 
-        if isinstance(obj, bytes):
-            return obj.decode('ascii')
+        if isinstance(o, bytes):
+            return o.decode('ascii')
 
-        if hasattr(obj, 'get_json_value'):
-            return obj.get_json_value()
+        if hasattr(o, 'get_json_value'):
+            return o.get_json_value()
 
-        if hasattr(obj, 'base_filename'):
+        if hasattr(o, 'base_filename'):
             return {
-                'filename': obj.base_filename,
-                'content_type': obj.content_type or 'application/octet-stream',
-                'content': base64.b64encode(obj.get_content()),
+                'filename': o.base_filename,
+                'content_type': o.content_type or 'application/octet-stream',
+                'content': base64.b64encode(o.get_content()),
             }
 
-        if obj.__class__.__name__ == '__proxy__':
+        if o.__class__.__name__ == '__proxy__':
             # lazy gettext
-            return str(obj)
+            return str(o)
 
         # Let the base class default method raise the TypeError
-        return json.JSONEncoder.default(self, obj)
+        return json.JSONEncoder.default(self, o)
 
 
 def json_encode_helper(d, charset):

wcs/qommon/sessions.py

@@ -220,7 +220,7 @@ class Session(QommonSession, CaptchaSession, StorableObject):
                 self.set_user(None)
         return None
 
-    def set_user(self, user_id):
+    def set_user(self, user_id):  # noqa pylint: disable=arguments-renamed
         self.id = None  # force a new session id to be assigned
         self.extra_user_variables = None
         QuixoteSession.set_user(self, user_id)

wcs/qommon/template.py

@@ -54,13 +54,13 @@ def get_theme_directory(theme_id):
 
 
 class ThemesDirectory(Directory):
-    def _q_lookup(self, name):
+    def _q_lookup(self, component):
         from . import errors
 
-        if name in ('.', '..'):
+        if component in ('.', '..'):
             raise errors.TraversalError()
 
-        location = get_theme_directory(name)
+        location = get_theme_directory(component)
         if location is None:
             raise errors.TraversalError()
 

wcs/workflows.py

@@ -354,13 +354,13 @@ class WorkflowVariablesFieldsFormDef(FormDef):
         base_url = get_publisher().get_backoffice_url()
         return '%s/workflows/%s/variables/fields/' % (base_url, self.workflow.id)
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         for field in self.fields:
             if hasattr(field, 'widget_class'):
                 if not field.varname:
                     field.varname = misc.simplify(field.label, space='_')
         self.workflow.variables_formdef = self
-        self.workflow.store(comment=comment)
+        self.workflow.store(comment=comment, *args, **kwargs)
 
 
 class WorkflowBackofficeFieldsFormDef(FormDef):
@@ -434,7 +434,7 @@ class Workflow(StorableObject):
         if changed:
             self.store()
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         must_update = False
         if self.id:
@@ -459,7 +459,7 @@ class Workflow(StorableObject):
         elif self.backoffice_fields_formdef:
             must_update = True
 
-        StorableObject.store(self)
+        StorableObject.store(self, *args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)
 

wcs/wscalls.py

@@ -244,7 +244,7 @@ class NamedWsCall(XmlStorableObject):
         request['post_formdata'] = bool(element.find('post_formdata') is not None)
         return request
 
-    def store(self, comment=None):
+    def store(self, comment=None, *args, **kwargs):
         assert not self.is_readonly()
         if self.slug is None:
             # set slug if it's not yet there
@@ -252,7 +252,7 @@ class NamedWsCall(XmlStorableObject):
         if self.id and self.slug != self.id:
             self.remove_object(self.id)
         self.id = self.slug
-        super().store()
+        super().store(*args, **kwargs)
         if get_publisher().snapshot_class:
             get_publisher().snapshot_class.snap(instance=self, comment=comment)