From ba9305438ed986d1ad66844bbd6247c4b0bbcb58 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 21 Dec 2021 14:24:00 -0500
Subject: [PATCH 1/2] Update deprecated python import.

---
 python/mach/mach/main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python/mach/mach/main.py b/python/mach/mach/main.py
index 6de9f92881e..83f01128513 100644
--- a/python/mach/mach/main.py
+++ b/python/mach/mach/main.py
@@ -16,7 +16,7 @@ import os
 import sys
 import traceback
 import uuid
-from collections import Iterable
+from collections.abc import Iterable
 
 from six import string_types
 

From c709f366918a4dd91b4894f6b1fd740357c4507d Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Tue, 21 Dec 2021 23:53:09 -0500
Subject: [PATCH 2/2] Ignore mach when tidying.

---
 servo-tidy.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/servo-tidy.toml b/servo-tidy.toml
index 0ef6ec937b5..9127ed67112 100644
--- a/servo-tidy.toml
+++ b/servo-tidy.toml
@@ -144,6 +144,7 @@ directories = [
   "./components/script/dom/bindings/codegen/parser",
   "./components/script/dom/bindings/codegen/ply",
   "./python/_virtualenv*",
+  "./python/mach",
   "./components/hashglobe/src",
   # Generated and upstream code combined with our own. Could use cleanup
   "./target",