diff --git a/eepromtool/cluster.py b/eepromtool/cluster.py index 4c6a81b..53625cc 100644 --- a/eepromtool/cluster.py +++ b/eepromtool/cluster.py @@ -96,7 +96,7 @@ class clustereeprom: def printStatus(self): logging.info("EEPROM Status:") logging.info("- Type: %s" % self.bin_type) - if self.getVINDetail() is not "": + if self.getVINDetail() != "": logging.info("- VIN: %s (%s)" % (self.getVIN(),self.getVINDetail())) else: logging.info("- VIN: %s" % (self.getVIN())) @@ -179,7 +179,7 @@ class clustereeprom: def setVIN(self,newvin): logging.debug("Trying to set vin to %s (%s)" % (newvin,parsevin(newvin))) try: - if len(newvin) is not 17: + if len(newvin) != 17: logging.error("ERROR: VIN number must be 17 characters") exit(1) logging.info("Setting VIN to %s" % newvin) @@ -202,7 +202,7 @@ class clustereeprom: def setImmoID(self,immoid): logging.debug("Trying to set immo ID to %s" % immoid) try: - if len(immoid) is not 14: + if len(immoid) != 14: logging.error("ERROR: VIN number must be 14 characters") exit(1) logging.info("Setting Immo ID to %s" % immoid) diff --git a/eepromtool/ecu.py b/eepromtool/ecu.py index a5dca2f..1d4e534 100644 --- a/eepromtool/ecu.py +++ b/eepromtool/ecu.py @@ -246,7 +246,7 @@ class ecueeprom: logging.info("EEPROM Status:") logging.info("- Type: %s" % self.bin_type) logging.info("- Version: Immo%d" % self.immover) - if self.getVINDetail() is not "": + if self.getVINDetail() != "": logging.info("- VIN: %s (%s)" % (self.getVIN(),self.getVINDetail())) else: logging.info("- VIN: %s" % (self.getVIN())) @@ -350,7 +350,7 @@ class ecueeprom: def setVIN(self,newvin): - if len(newvin) is not 17: + if len(newvin) != 17: logging.error("ERROR: VIN number must be 17 characters") exit(1) logging.info("Setting VIN to %s" % newvin) diff --git a/eepromtool_04.py b/eepromtool_04.py index 918539e..a22dd31 100644 --- a/eepromtool_04.py +++ b/eepromtool_04.py @@ -5,7 +5,7 @@ import logging # Minor edit, 28-9-2018 # Converted to Python3, 13-02-2019 -VERSION = 0.4 +VERSION = 0.5 WARN = False DEBUG = False @@ -43,7 +43,7 @@ from eepromtool.cluster import clustereeprom def main(): logging.basicConfig(level=logging.INFO) - logging.warn("95040 Eeprom Tool - " + str(VERSION) + "- No warranty implied or given, manually verify all changes before saving eeprom to ECU, this tool could cause permenent damage to ECU and prevent vehicle running\n") + logging.warning("95040 Eeprom Tool - " + str(VERSION) + "- No warranty implied or given, manually verify all changes before saving eeprom to ECU, this tool could cause permenent damage to ECU and prevent vehicle running\n") parser = argparse.ArgumentParser(description='95040 Eeprom Tool ' + str(VERSION) + ' View/Modify me7.5 eeprom files') parser.add_argument('--in',dest='infile',help='Input eeprom bin',required=True) parser.add_argument('--out',dest='outfile',help='File to save eeprom to (must be supplied if changing Immo/VIN)')