From 78a61815e0b798d2b5c0dc4876d26e404d79b630 Mon Sep 17 00:00:00 2001
From: Alex Lopez <alex.lopez.zorzano@gmail.com>
Date: Tue, 21 Sep 2021 20:38:15 +0000
Subject: [PATCH] Bug 1696251 - Rename methods that would shadow builtin
 functions when de-classing. r=mhentges

Differential Revision: https://phabricator.services.mozilla.com/D126275
---
 python/mozbuild/mozbuild/mach_commands.py | 2 +-
 tools/lint/mach_commands.py               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/python/mozbuild/mozbuild/mach_commands.py b/python/mozbuild/mozbuild/mach_commands.py
index 781dae2c150f4..0ea39b2dac205 100644
--- a/python/mozbuild/mozbuild/mach_commands.py
+++ b/python/mozbuild/mozbuild/mach_commands.py
@@ -488,7 +488,7 @@ class Warnings(MachCommandBase):
         help="Warnings report to display. If not defined, show the most "
         "recent report.",
     )
-    def list(self, command_context, directory=None, flags=None, report=None):
+    def list_warnings(self, command_context, directory=None, flags=None, report=None):
         database = self.get_warnings_database(command_context)
 
         by_name = sorted(database.warnings)
diff --git a/tools/lint/mach_commands.py b/tools/lint/mach_commands.py
index bc72bbb938d03..b8967f84fa9e5 100644
--- a/tools/lint/mach_commands.py
+++ b/tools/lint/mach_commands.py
@@ -142,7 +142,7 @@ class MachCommands(MachCommandBase):
         description="Format files, alternative to 'lint --fix' ",
         parser=setup_argument_parser,
     )
-    def format(self, command_context, paths, extra_args=[], **kwargs):
+    def format_files(self, command_context, paths, extra_args=[], **kwargs):
         linters = kwargs["linters"]
 
         if not linters:
-- 
GitLab