Added underscore to ignore new pydocstyle item (#428)

* Added underscore to ignore new item

Signed-off-by: Crola1702 <cristobal.arroyo@ekumenlabs.com>
(cherry picked from commit ae431ed)

# Conflicts:
#	ament_pep257/ament_pep257/main.py

ament_pep257/ament_pep257/main.py

@@ -129,6 +129,7 @@ def generate_pep257_report(paths, excludes, ignore):
     report = []
 
     files_dict = {}
+<<<<<<< HEAD
     if LooseVersion(pydocstyle.__version__) >= LooseVersion('2.0.0'):
         for filename, checked_codes, ignore_decorators in files_to_check:
             if _filename_in_excludes(filename, excludes):
@@ -144,6 +145,16 @@ def generate_pep257_report(paths, excludes, ignore):
             files_dict[filename] = {
                 'select': select,
             }
+=======
+    # Unpack 3 values for pydocstyle <= 6.1.1 and 4 values for pydocstyle >= 6.2.0
+    for filename, checked_codes, ignore_decorators, *_ in files_to_check:
+        if _filename_in_excludes(filename, excludes):
+            continue
+        files_dict[filename] = {
+            'select': checked_codes,
+            'ignore_decorators': ignore_decorators,
+        }
+>>>>>>> ae431ed (Added underscore to ignore new pydocstyle item (#428))
 
     for filename in sorted(files_dict.keys()):
         print('checking', filename)