diff --git a/scripts/fru_gen.py b/scripts/fru_gen.py
index a8d148a..4375086 100755
--- a/scripts/fru_gen.py
+++ b/scripts/fru_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys
diff --git a/scripts/inventory-sensor.py b/scripts/inventory-sensor.py
index 2dd1e8d..1a4e5db 100755
--- a/scripts/inventory-sensor.py
+++ b/scripts/inventory-sensor.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys
diff --git a/scripts/inventorysensor.mako.cpp b/scripts/inventorysensor.mako.cpp
index f1ea8cd..68af3e8 100644
--- a/scripts/inventorysensor.mako.cpp
+++ b/scripts/inventorysensor.mako.cpp
@@ -7,7 +7,7 @@
 using namespace ipmi::sensor;
 
 extern const InvObjectIDMap invSensors = {
-% for key in sensorDict.iterkeys():
+% for key in sensorDict.keys():
    % if key:
 {"${key}",
     {
diff --git a/scripts/sensor_gen.py b/scripts/sensor_gen.py
index 6f59021..f03bea8 100755
--- a/scripts/sensor_gen.py
+++ b/scripts/sensor_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import os
 import sys
diff --git a/scripts/writesensor.mako.cpp b/scripts/writesensor.mako.cpp
index c740f6f..709e70d 100644
--- a/scripts/writesensor.mako.cpp
+++ b/scripts/writesensor.mako.cpp
@@ -4,7 +4,7 @@
 <%
 interfaceDict = {}
 %>\
-%for key in sensorDict.iterkeys():
+%for key in sensorDict.keys():
 <%
     sensor = sensorDict[key]
     serviceInterface = sensor["serviceInterface"]
@@ -32,7 +32,7 @@
 namespace sensor {
 
 extern const IdInfoMap sensors = {
-% for key in sensorDict.iterkeys():
+% for key in sensorDict.keys():
    % if key:
 {${key},{
 <%
@@ -82,7 +82,7 @@
 <%
 try:
     preReq = property_value["Prereqs"]
-except KeyError, e:
+except KeyError:
     preReq = dict()
 %>\
                     {
@@ -116,7 +116,7 @@
         skipVal = "SkipAssertion::DEASSERT"
     else:
         assert "Unknown skip value " + str(skip)
-except KeyError, e:
+except KeyError:
     skipVal = "SkipAssertion::NONE"
 %>\
                                 ${skipVal},