diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
index 015f2dcafd5076f340d487b9b391cbd66931a7c1..bca00e3c2a1cb74676cd2fff1f8cd8903c58fa96 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/CMakeLists.txt
@@ -13,4 +13,4 @@ atlas_add_component( CaloD3PDMaker
                      LINK_LIBRARIES ${CLHEP_LIBRARIES} CaloConditions CaloInterfaceLib CaloEvent CaloIdentifier CaloUtilsLib AthContainers AthenaBaseComps AthenaKernel xAODCaloEvent GaudiKernel LArRecEvent D3PDMakerUtils PrimaryDPDMakerLib TileEvent TileIdentifier )
 
 # Install files from the package:
-atlas_install_python_modules( python/*.py )
+atlas_install_python_modules( python/*.py POST_BUILD_CMD ${ATLAS_FLAKE8} )
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
index 897800d3529291c9b59143470a40917788e27166..f4f0e8af5cf90defb7508311a740ef5c1177450b 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CaloCellD3PDObject.py
@@ -1,11 +1,9 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 import CaloD3PDMaker
 import D3PDMakerCoreComps
 import EventCommonD3PDMaker
 from D3PDMakerCoreComps.D3PDObject import D3PDObject
-from D3PDMakerConfig.D3PDMakerFlags import D3PDMakerFlags
-from CaloD3PDMaker import CaloD3PDMakerConf
 from CaloIdentifier import SUBCALO
 from CaloD3PDMaker.makeCaloCellFilterAlg import makeCaloCellFilterAlg 
 from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -20,8 +18,8 @@ prefix_to_det["cc_tile_"] = [SUBCALO.TILE]
 def makeCellD3PDObject (name, prefix, object_name, getter = None,
                            sgkey = None,
                            label = None):
-    if sgkey == None: sgkey = 'AllCalo'
-    if label == None: label = prefix
+    if sgkey is None: sgkey = 'AllCalo'
+    if label is None: label = prefix
 
     if prefix in prefix_to_det.keys():
         sgkey = prefix 
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
index 504541e83e039acdd0541eb78f55b5167c3b1514..0ad5aaffbe9556146a2043829f8a3d5dbac7323a 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-# $Id$
 #
 # @file CaloD3PDMaker/python/CollisionDecisionD3PDObject.py
 # @author scott snyder <snyder@bnl.gov>
@@ -9,7 +8,6 @@
 #
 
 
-import CaloD3PDMaker
 import EventCommonD3PDMaker
 from CaloD3PDMaker.CollisionDecisionGetter import CollisionDecisionGetter
 from D3PDMakerConfig.D3PDMakerFlags        import D3PDMakerFlags
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
index 5a3754d0c99d8cc8c658117d96ad3b23eba99b14..ff9b229c5c0e937deb24135cf9f3b33c95942d1c 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionDecisionGetter.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 # $Id$
 #
@@ -70,7 +70,7 @@ class CollisionDecisionGetter ( Configured )  :
 
             self._handle = skimmer
 
-        except:
+        except Exception:
             mlog.error ("Error configuring LArCollisionTimeAlg.")
             traceback.print_exc()
 
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
index ebe7181ae57c2b8b69e246e7b5f82823904a5afb..ecdd52b57e2e87d440e5d7ba6ad298dbf0770efc 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/CollisionFilterAlg.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-# $Id$
 #
 # @file CaloD3PDMaker/python/CollisionFilterAlg.py
 # @author scott snyder <snyder@bnl.gov>
@@ -42,8 +41,8 @@ class CollisionFilterAlg (PyAthena.Alg):
         sdc = self.sg.retrieve( "SkimDecisionCollection",
                                 self.SkimDecisionsContainerName )
         passed = False
-        if sdc == None:
-            self.msg.error ("Can't find SkimDecisionCollection " +
+        if sdc is None:
+            self.msg.error ("Can't find SkimDecisionCollection %s",
                             self.SkimDecisionsContainerName)
         else:
             for sd in sdc:
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
index 754f34e671c7bdcf244bfd386dc85570f5e11c09..925caf48fb318c32a495a577d9d9007eb547e797 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/MBTSD3PDObject.py
@@ -1,6 +1,5 @@
-# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
-# $Id$
 #
 # @file CaloD3PDMaker/python/MBTSD3PDObject.py
 # @author scott snyder <snyder@bnl.gov>
@@ -13,7 +12,7 @@
 # setup (that doesn't use GeoModelSvc).
 from AthenaCommon.AppMgr import ServiceMgr 
 if not hasattr (ServiceMgr, 'DetDescrCnvSvc'):
-    import DetDescrCnvSvc.DetStoreConfig
+    import DetDescrCnvSvc.DetStoreConfig  # noqa: F401
     ServiceMgr.DetDescrCnvSvc.DoInitNeighbours = False
 
 import CaloD3PDMaker
diff --git a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
index 850b63d4f71dffe2acc8cd506798d5973544633e..b0e3bbccfb4459c7d389b28da6547fee1f9754e4 100644
--- a/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
+++ b/PhysicsAnalysis/D3PDMaker/CaloD3PDMaker/python/makeTileCellFilterAlg.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 
 from CaloIdentifier import SUBCALO
-from AthenaCommon.AppMgr import ServiceMgr as svcMgr
 
 def makeTileCellFilterAlg( CellsName = "AllCalo",
                            OutputCellsName="SelectedCells",