porting from python2 to python3

chrispyduck · chrispyduck · commit ce8bdd8140a8 · 2015-02-16T12:25:15.000-05:00
diff --git a/obd/OBDCommand.py b/obd/OBDCommand.py
@@ -1,7 +1,7 @@
 
 import re
-from utils import *
-from debug import debug
+from .utils import *
+from .debug import debug
 
 
 
@@ -46,17 +46,17 @@ def compute(self, _data):
 		r = Response(_data)
 
 		# split by lines, and remove empty lines
-		lines = filter(bool, re.split("[\r\n]", _data))
+		lines = list(filter(bool, re.split("[\r\n]", _data)))
 
 		# splits each line by spaces (each element should be a hex byte)
 		lines = [line.split() for line in lines]
 
 		# filter by minimum response length (number of space delimited chunks (bytes))
-		lines = filter(lambda line: len(line) >= 7, lines)
+		lines = [line for line in lines if len(line) >= 7]
 
 		if len(lines) > 1:
 			# filter for ECU 10 (engine)
-			lines = filter(lambda line: line[2] == '10', lines)
+			lines = [line for line in lines if line[2] == '10']
 
 		# by now, we should have only one line.
 		# Any more, and its a multiline response (which this library can't handle yet)
diff --git a/obd/__init__.py b/obd/__init__.py
@@ -30,9 +30,9 @@
 
 __version__ = '0.3.0'
 
-from obd import OBD
-from OBDCommand import OBDCommand
-from commands import commands
-from utils import scanSerial, Unit
-from debug import debug
-from async import Async
+from .obd import OBD
+from .OBDCommand import OBDCommand
+from .commands import commands
+from .utils import scanSerial, Unit
+from .debug import debug
+from .async import Async
diff --git a/obd/async.py b/obd/async.py
@@ -28,16 +28,13 @@
 #                                                                      #
 ########################################################################
 
-import obd
 import time
 import threading
-from utils import Response
-from commands import OBDCommand
-from debug import debug
+from .utils import Response
+from .debug import debug
+from . import OBD
 
-
-
-class Async(obd.OBD):
+class Async(OBD):
 	""" subclass representing an OBD-II connection """
 
 	def __init__(self, portstr=None):
@@ -85,7 +82,7 @@ def watch(self, c, callback=None, force=False):
 				return
 
 			# new command being watched, store the command
-			if not self.commands.has_key(c):
+			if c not in self.commands:
 				debug("Watching command: %s" % str(c))
 				self.commands[c] = Response() # give it an initial value
 				self.callbacks[c] = [] # create an empty list
@@ -130,7 +127,7 @@ def unwatch_all(self):
 
 
 	def query(self, c):
-		if self.commands.has_key(c):
+		if c in self.commands:
 			return self.commands[c]
 		else:
 			return Response()
diff --git a/obd/commands.py b/obd/commands.py
@@ -28,9 +28,9 @@
 #                                                                      #
 ########################################################################
 
-from OBDCommand import OBDCommand
-from decoders import *
-from debug import debug
+from .OBDCommand import OBDCommand
+from .decoders import *
+from .debug import debug
 
 
 
@@ -202,7 +202,7 @@ def __init__(self):
 	def __getitem__(self, key):
 		if isinstance(key, int):
 			return self.modes[key]
-		elif isinstance(key, basestring):
+		elif isinstance(key, str):
 			return self.__dict__[key]
 		else:
 			debug("OBD commands can only be retrieved by PID value or dict name", True)
@@ -249,7 +249,7 @@ def has_command(self, c):
 
 	# checks for existance of command by name
 	def has_name(self, s):
-		if isinstance(s, basestring):
+		if isinstance(s, str):
 			return s.isupper() and (s in self.__dict__.keys())
 		else:
 			debug("has_name() only accepts string names for commands", True)
diff --git a/obd/decoders.py b/obd/decoders.py
@@ -29,9 +29,9 @@
 ########################################################################
 
 import math
-from utils import *
-from codes import *
-from debug import debug
+from .utils import *
+from .codes import *
+from .debug import debug
 
 '''
 All decoders take the form:
diff --git a/obd/obd.py b/obd/obd.py
@@ -29,10 +29,10 @@
 ########################################################################
 
 import time
-from port import OBDPort, State
-from commands import commands
-from utils import scanSerial, Response
-from debug import debug
+from .port import OBDPort, State
+from .commands import commands
+from .utils import scanSerial, Response
+from .debug import debug
 
 
 
@@ -135,7 +135,7 @@ def load_commands(self):
 
 	def print_commands(self):
 		for c in self.supported_commands:
-			print str(c)
+			print(str(c))
 
 
 	def supports(self, c):
diff --git a/obd/port.py b/obd/port.py
@@ -31,8 +31,8 @@
 import serial
 import string
 import time
-from utils import Response, unhex
-from debug import debug
+from .utils import Response, unhex
+from .debug import debug
 
 
 class State():
diff --git a/obd/utils.py b/obd/utils.py
@@ -34,7 +34,7 @@
 import time
 import glob
 import sys
-from debug import debug
+from .debug import debug
 
 
 class Unit:
@@ -87,7 +87,7 @@ def __init__(self, name, available, incomplete):
 	def __str__(self):
 		a = "Available" if self.available else "Unavailable"
 		c = "Incomplete" if self.incomplete else "Complete"
-		return "Test %s: %s, %s" % (name, a, c)
+		return "Test %s: %s, %s" % (self.name, a, c)
 
 
 
diff --git a/tests/test_commands.py b/tests/test_commands.py
@@ -28,7 +28,7 @@ def test_unique_names():
 
 	for cmds in obd.commands.modes:
 		for cmd in cmds:
-			assert not names.has_key(cmd.name), "Two commands share the same name: %s" % cmd.name
+			assert not names.__contains__(cmd.name), "Two commands share the same name: %s" % cmd.name
 			names[cmd.name] = True
 
 
