diff --git a/.flake8 b/.flake8
index 3fa97a32b5d5..daed5699515c 100644
--- a/.flake8
+++ b/.flake8
@@ -6,5 +6,5 @@ max-line-length = 120
 ignore =
     E203,E305,E402,E501,E721,E741,F401,F403,F405,F821,F841,F999,W503,W504,C408,
     # ignores below are temporary, fix them and remove please!
-    B006,B007,B008,B902,B903
+    B007,B008,B902,B903
 exclude = docs/src,venv,third_party,caffe2,scripts,docs/caffe2,tools/amd_build/pyHIPIFY,torch/lib/include,torch/lib/tmp_install,build,torch/include
diff --git a/aten/src/ATen/code_template.py b/aten/src/ATen/code_template.py
index 186707c56be6..8a5a01f0a96a 100644
--- a/aten/src/ATen/code_template.py
+++ b/aten/src/ATen/code_template.py
@@ -30,7 +30,10 @@ class CodeTemplate(object):
         self.pattern = pattern
         self.filename = filename
 
-    def substitute(self, env={}, **kwargs):
+    def substitute(self, env=None, **kwargs):
+        if env is None:
+            env = {}
+
         def lookup(v):
             return kwargs[v] if v in kwargs else env[v]
 
diff --git a/aten/src/ATen/common_with_cwrap.py b/aten/src/ATen/common_with_cwrap.py
index 24eb2a149f5d..5270d4a8de60 100644
--- a/aten/src/ATen/common_with_cwrap.py
+++ b/aten/src/ATen/common_with_cwrap.py
@@ -95,7 +95,10 @@ def filter_unique_options(options, allow_kwarg, type_to_signature, remove_self):
 
 
 def enumerate_options_due_to_default(declaration,
-                                     allow_kwarg=True, type_to_signature=[], remove_self=True):
+                                     allow_kwarg=True, type_to_signature=None, remove_self=True):
+
+    if type_to_signature is None:
+        type_to_signature = []
 
     # Checks to see if an argument with a default keyword is a Tensor that
     # by default can be NULL. In this case, instead of generating another