Merge pull request #2051 from python-gitlab/jlvillal/more_more_pylint

chore: enable more pylint checks

5 files changed, 13 insertions, 8 deletions

diff --git a/gitlab/v4/cli.py b/gitlab/v4/cli.py
index da203ff..dac6ede 100644
--- a/gitlab/v4/cli.py
+++ b/gitlab/v4/cli.py
@@ -377,13 +377,14 @@ def get_dict(
 
 
 class JSONPrinter:
-    def display(self, d: Union[str, Dict[str, Any]], **kwargs: Any) -> None:
+    @staticmethod
+    def display(d: Union[str, Dict[str, Any]], **kwargs: Any) -> None:
         import json  # noqa
 
         print(json.dumps(d))
 
+    @staticmethod
     def display_list(
-        self,
         data: List[Union[str, gitlab.base.RESTObject]],
         fields: List[str],
         **kwargs: Any,
@@ -394,7 +395,8 @@ class JSONPrinter:
 
 
 class YAMLPrinter:
-    def display(self, d: Union[str, Dict[str, Any]], **kwargs: Any) -> None:
+    @staticmethod
+    def display(d: Union[str, Dict[str, Any]], **kwargs: Any) -> None:
         try:
             import yaml  # noqa
 
@@ -406,8 +408,8 @@ class YAMLPrinter:
                 "to use the yaml output feature"
             )
 
+    @staticmethod
     def display_list(
-        self,
         data: List[Union[str, gitlab.base.RESTObject]],
         fields: List[str],
         **kwargs: Any,
diff --git a/gitlab/v4/objects/files.py b/gitlab/v4/objects/files.py
index 894195c..aa86704 100644
--- a/gitlab/v4/objects/files.py
+++ b/gitlab/v4/objects/files.py
@@ -26,6 +26,8 @@ __all__ = [
 class ProjectFile(SaveMixin, ObjectDeleteMixin, RESTObject):
     _id_attr = "file_path"
     _repr_attr = "file_path"
+    branch: str
+    commit_message: str
     file_path: str
     manager: "ProjectFileManager"
 
diff --git a/gitlab/v4/objects/ldap.py b/gitlab/v4/objects/ldap.py
index 4a01061..053cd14 100644
--- a/gitlab/v4/objects/ldap.py
+++ b/gitlab/v4/objects/ldap.py
@@ -49,5 +49,4 @@ class LDAPGroupManager(RESTManager):
         obj = self.gitlab.http_list(path, **data)
         if isinstance(obj, list):
             return [self._obj_cls(self, item) for item in obj]
-        else:
-            return RESTObjectList(self, self._obj_cls, obj)
+        return RESTObjectList(self, self._obj_cls, obj)
diff --git a/gitlab/v4/objects/merge_request_approvals.py b/gitlab/v4/objects/merge_request_approvals.py
index 36224d1..a22bd2b 100644
--- a/gitlab/v4/objects/merge_request_approvals.py
+++ b/gitlab/v4/objects/merge_request_approvals.py
@@ -168,6 +168,8 @@ class ProjectMergeRequestApprovalRule(SaveMixin, ObjectDeleteMixin, RESTObject):
     _id_attr = "approval_rule_id"
     _repr_attr = "approval_rule"
     id: int
+    approval_rule_id: int
+    merge_request_iid: int
 
     @exc.on_http_error(exc.GitlabUpdateError)
     def save(self, **kwargs: Any) -> None:
diff --git a/gitlab/v4/objects/packages.py b/gitlab/v4/objects/packages.py
index 0461bdc..882cb1a 100644
--- a/gitlab/v4/objects/packages.py
+++ b/gitlab/v4/objects/packages.py
@@ -73,8 +73,8 @@ class GenericPackageManager(RESTManager):
         try:
             with open(path, "rb") as f:
                 file_data = f.read()
-        except OSError:
-            raise exc.GitlabUploadError(f"Failed to read package file {path}")
+        except OSError as e:
+            raise exc.GitlabUploadError(f"Failed to read package file {path}") from e
 
         url = f"{self._computed_path}/{package_name}/{package_version}/{file_name}"
         server_data = self.gitlab.http_put(url, post_data=file_data, raw=True, **kwargs)