Fix some warnings from ruff.

5 files changed, 25 insertions, 24 deletions

diff --git a/test/ScintillaCallable.py b/test/ScintillaCallable.py
index 126281aac..2f12c6ba8 100644
--- a/test/ScintillaCallable.py
+++ b/test/ScintillaCallable.py
@@ -2,9 +2,9 @@
 
 from __future__ import unicode_literals
 
-import ctypes, os, sys
+import ctypes
 
-from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long, c_ssize_t
+from ctypes import c_int, c_char_p, c_long, c_ssize_t
 
 def IsEnumeration(t):
 	return t[:1].isupper()
@@ -52,7 +52,7 @@ class SciCall:
 		self._ptr = ptr
 		self._msg = msg
 		self._stringResult = stringResult
-	def __call__(self, w=0, l=0):
+	def __call__(self, w=0, lp=0):
 		ww = ctypes.cast(w, c_char_p)
 		if self._stringResult:
 			lengthBytes = self._fn(self._ptr, self._msg, ww, None)
@@ -63,7 +63,7 @@ class SciCall:
 			assert lengthBytes == lengthBytes2
 			return bytearray(result)[:lengthBytes]
 		else:
-			ll = ctypes.cast(l, c_char_p)
+			ll = ctypes.cast(lp, c_char_p)
 			return self._fn(self._ptr, self._msg, ww, ll)
 
 sciFX = ctypes.CFUNCTYPE(c_ssize_t, c_char_p, c_int, c_char_p, c_char_p)
diff --git a/test/XiteWin.py b/test/XiteWin.py
index 1321448c6..9acf6ebfd 100644
--- a/test/XiteWin.py
+++ b/test/XiteWin.py
@@ -8,8 +8,7 @@ from __future__ import unicode_literals
 import os, platform, sys, unittest
 
 import ctypes
-from ctypes import wintypes
-from ctypes import c_int, c_ulong, c_char_p, c_wchar_p, c_ushort, c_uint, c_long
+from ctypes import c_int, c_char_p, c_wchar_p, c_ushort, c_uint
 from ctypes.wintypes import HWND, WPARAM, LPARAM, HANDLE, HBRUSH, LPCWSTR
 user32=ctypes.windll.user32
 gdi32=ctypes.windll.gdi32
@@ -248,11 +247,11 @@ class XiteWin():
 	def Invalidate(self):
 		user32.InvalidateRect(self.win, 0, 0)
 
-	def WndProc(self, h, m, w, l):
+	def WndProc(self, h, m, wp, lp):
 		user32.DefWindowProcW.argtypes = [HWND, c_uint, WPARAM, LPARAM]
 		ms = sgsm.get(m, "XXX")
 		if trace:
-			print("%s %s %s %s" % (hex(h)[2:],ms,w,l))
+			print("%s %s %s %s" % (hex(h)[2:],ms,wp,lp))
 		if ms == "WM_CLOSE":
 			user32.PostQuitMessage(0)
 		elif ms == "WM_CREATE":
@@ -260,20 +259,20 @@ class XiteWin():
 			return 0
 		elif ms == "WM_SIZE":
 			# Work out size
-			if w != 1:
+			if wp != 1:
 				self.OnSize()
 			return 0
 		elif ms == "WM_COMMAND":
-			cmdCode = w & 0xffff
+			cmdCode = wp & 0xffff
 			if cmdCode in self.cmds:
 				self.Command(self.cmds[cmdCode])
 			return 0
 		elif ms == "WM_ACTIVATE":
-			if w != WA_INACTIVE:
+			if wp != WA_INACTIVE:
 				self.FocusOnEditor()
 			return 0
 		else:
-			return user32.DefWindowProcW(h, m, w, l)
+			return user32.DefWindowProcW(h, m, wp, lp)
 		return 0
 
 	def Command(self, name):
@@ -506,7 +505,7 @@ class XiteWin():
 		self.Open()
 
 	def CmdSave(self):
-		if (self.fullPath == None) or (len(self.fullPath) == 0):
+		if (self.fullPath is None) or (len(self.fullPath) == 0):
 			self.SaveAs()
 		else:
 			self.Save()
diff --git a/test/performanceTests.py b/test/performanceTests.py
index a3df73465..e9eff9e6a 100644
--- a/test/performanceTests.py
+++ b/test/performanceTests.py
@@ -5,7 +5,7 @@
 from __future__ import with_statement
 from __future__ import unicode_literals
 
-import os, string, sys, time, unittest
+import string, time, unittest
 
 try:
 	start = time.perf_counter()
diff --git a/test/simpleTests.py b/test/simpleTests.py
index 9f1b97c98..485147d6a 100644
--- a/test/simpleTests.py
+++ b/test/simpleTests.py
@@ -414,7 +414,7 @@ class TestSimple(unittest.TestCase):
 		self.xite.ChooseLexer(b"cpp")
 		self.ed.SetCodePage(65001)
 		self.ed.SetLineEndTypesAllowed(1)
-		text = b"x\xe2\x80\xa9y";
+		text = b"x\xe2\x80\xa9y"
 		self.ed.AddText(5, text)
 		self.assertEquals(self.ed.LineCount, 2)
 
@@ -501,7 +501,7 @@ class TestSimple(unittest.TestCase):
 		self.xite.ChooseLexer(b"cpp")
 		self.ed.SetCodePage(65001)
 		self.ed.SetLineEndTypesAllowed(1)
-		text = b"x\xc2\x85y";
+		text = b"x\xc2\x85y"
 		self.ed.AddText(4, text)
 		self.assertEquals(self.ed.LineCount, 2)
 
@@ -1165,8 +1165,10 @@ class TestMarkers(unittest.TestCase):
 
 	def testTwiceAddedDelete(self):
 		handle = self.ed.MarkerAdd(1,1)
+		self.assertNotEqual(handle, -1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
 		handle2 = self.ed.MarkerAdd(1,1)
+		self.assertNotEqual(handle2, -1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
 		self.ed.MarkerDelete(1,1)
 		self.assertEquals(self.ed.MarkerGet(1), 2)
@@ -1207,7 +1209,9 @@ class TestMarkers(unittest.TestCase):
 	def testMarkerNext(self):
 		self.assertEquals(self.ed.MarkerNext(0, 2), -1)
 		h1 = self.ed.MarkerAdd(0,1)
+		self.assertNotEqual(h1, -1)
 		h2 = self.ed.MarkerAdd(2,1)
+		self.assertNotEqual(h2, -1)
 		self.assertEquals(self.ed.MarkerNext(0, 2), 0)
 		self.assertEquals(self.ed.MarkerNext(1, 2), 2)
 		self.assertEquals(self.ed.MarkerNext(2, 2), 2)
@@ -2448,8 +2452,6 @@ class TestIndices(unittest.TestCase):
 
 	def testUTF16(self):
 		self.assertEquals(self.ed.GetLineCharacterIndex(), self.ed.SC_LINECHARACTERINDEX_NONE)
-		t = "aå\U00010348flﬔ-"
-		tv = t.encode("UTF-8")
 		self.ed.SetContents(self.tv)
 		self.ed.AllocateLineCharacterIndex(self.ed.SC_LINECHARACTERINDEX_UTF16)
 		self.assertEquals(self.ed.IndexPositionFromLine(0, self.ed.SC_LINECHARACTERINDEX_UTF16), 0)
@@ -2821,7 +2823,8 @@ class TestSubStyles(unittest.TestCase):
 
 	def testSecondary(self):
 		inactiveDistance = self.ed.DistanceToSecondaryStyles()
-		self.assertEquals(self.ed.GetPrimaryStyleFromStyle(self.ed.SCE_C_IDENTIFIER+inactiveDistance), self.ed.SCE_C_IDENTIFIER)
+		inactiveIdentifier = self.ed.SCE_C_IDENTIFIER+inactiveDistance
+		self.assertEquals(self.ed.GetPrimaryStyleFromStyle(inactiveIdentifier), self.ed.SCE_C_IDENTIFIER)
 
 class TestCallTip(unittest.TestCase):
 
diff --git a/test/win32Tests.py b/test/win32Tests.py
index 974f6ceae..d1fc3652f 100644
--- a/test/win32Tests.py
+++ b/test/win32Tests.py
@@ -10,11 +10,10 @@
 from __future__ import with_statement
 from __future__ import unicode_literals
 
-import codecs, ctypes, os, sys, unittest
+import ctypes, unittest
 
-from MessageNumbers import msgs, sgsm
+from MessageNumbers import msgs
 
-import ctypes
 user32 = ctypes.windll.user32
 
 import XiteWin as Xite
@@ -32,8 +31,8 @@ class TestWins(unittest.TestCase):
 
 	# Helper methods
 
-	def Send(self, msg, w, l):
-		return user32.SendMessageW(self.sciHwnd, msgs[msg], w, l)
+	def Send(self, msg, wp, lp):
+		return user32.SendMessageW(self.sciHwnd, msgs[msg], wp, lp)
 
 	def GetTextLength(self):
 		return self.Send("WM_GETTEXTLENGTH", 0, 0)