Fix some pylint and ruff check warnings.

Author: zufuliu

scintilla/scripts/EastAsianWidth.py

@@ -1,7 +1,6 @@
-# https://www.unicode.org/reports/tr41/
+# East Asian Width
 # https://www.unicode.org/reports/tr11/
 
-from FileGenerator import Regenerate
 from MultiStageTable import *
 from UnicodeData import *
 

scintilla/scripts/GenerateCaseConvert.py

@@ -49,9 +49,9 @@ def conversionSets():
 	complexes = []
 	symmetrics = []
 	for ch in range(UnicodeCharacterCount):
-		if ch >= 0xd800 and ch <= 0xDBFF:
+		if 0xd800 <= ch <= 0xDBFF:
 			continue
-		if ch >= 0xdc00 and ch <= 0xDFFF:
+		if 0xdc00 <= ch <= 0xDFFF:
 			continue
 		uch = chr(ch)
 

scintilla/scripts/GenerateCharTable.py

@@ -23,12 +23,12 @@ def BytesFromLead(leadByte):
 	def UTF8IsLeadByte(ch):
 		if ch <= 0x7F:
 			return True
-		if ch >= 0xC2 and ch <= 0xF4:
+		if 0xC2 <= ch <= 0xF4:
 			return True
 		return False
 
 	def UTF8IsTrailByte(ch):
-		return ch >= 0x80 and ch <= 0xBF
+		return 0x80 <= ch <= 0xBF
 
 	def UTF8IntervalNumber(ch):
 		# UTF8-1
@@ -45,12 +45,12 @@ def UTF8IntervalNumber(ch):
 		if ch == 0xC0 or ch == 0xC1:
 			return 11
 		# UTF8-2
-		if ch >= 0xC2 and ch <= 0xDF:
+		if 0xC2 <= ch <= 0xDF:
 			return 4
 		# UTF8-3
 		if ch == 0xE0:
 			return 5
-		if ch >= 0xE1 and ch <= 0xEC:
+		if 0xE1 <= ch <= 0xEC:
 			return 6
 		if ch == 0xED:
 			return 7
@@ -59,7 +59,7 @@ def UTF8IntervalNumber(ch):
 		# UTF8-4
 		if ch == 0xF0:
 			return 8
-		if ch >= 0xF1 and ch <= 0xF3:
+		if 0xF1 <= ch <= 0xF3:
 			return 9
 		if ch == 0xF4:
 			return 10

scintilla/scripts/GenerateCharacterCategory.py

@@ -79,9 +79,9 @@ def GetPreferredCharacterClass(values):
 # https://en.wikipedia.org/wiki/Private_Use_Areas
 # Category: Other, private use (Co)
 def isPrivateChar(c):
-	return (c >= 0xE000 and c <= 0xF8FF) \
-		or (c >= 0xF0000 and c <= 0xFFFFD) \
-		or (c >= 0x100000 and c <= 0x10FFFD)
+	return (0xE000 <= c <= 0xF8FF) \
+		or (0xF0000 <= c <= 0xFFFFD) \
+		or (0x100000 <= c <= 0x10FFFD)
 
 # https://en.wikipedia.org/wiki/Unicode_block
 # https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_Multilingual_Plane
@@ -157,7 +157,7 @@ def isCJKCharacter(category, ch):
 		return False
 
 	for block in CJKBlockList:
-		if ch >= block[0] and ch <= block[1]:
+		if block[0] <= ch <= block[1]:
 			return True
 
 	return False
@@ -490,18 +490,18 @@ def isReservedOrUDC_GBK(ch, buf):
 	ch1 = buf[0]
 	ch2 = buf[1]
 	# user-defined 1 and 2
-	if ((ch1 >= 0xAA and ch1 <= 0xAF) or (ch1 >= 0xF8 and ch1 <= 0xFE)) \
-		and (ch2 >= 0xA1 and ch2 <= 0xFE):
+	if ((0xAA <= ch1 <= 0xAF) or (0xF8 <= ch1 <= 0xFE)) \
+		and (0xA1 <= ch2 <= 0xFE):
 		return True
 	# user-defined 3
-	if (ch1 >= 0xA1 and ch1 <= 0xA7) and (ch2 >= 0x40 and ch2 <= 0xA0 and ch2 != 0x7F):
+	if (0xA1 <= ch1 <= 0xA7) and ((0x40 <= ch2 <= 0xA0) and ch2 != 0x7F):
 		return True
 	return False
 
 # https://en.wikipedia.org/wiki/Big5
 def isReservedOrUDC_Big5(ch, buf):
 	for block in [(0x8140, 0xA0FE), (0xA3C0, 0xA3FE), (0xC6A1, 0xC8FE), (0xF9D6, 0xFEFE)]:
-		if ch >= block[0] and ch <= block[1]:
+		if block[0] <= ch <= block[1]:
 			return True
 	return False
 

scintilla/scripts/HFacerCheck.py

@@ -102,7 +102,7 @@ def checkLexerDefinition():
 		lexer = prefixMap[prefix]
 		valList = lexrList.setdefault(lexer, {})
 		value = int(value)
-		if value >= STYLE_FIRSTPREDEFINED and value <= STYLE_LASTPREDEFINED:
+		if STYLE_FIRSTPREDEFINED <= value <= STYLE_LASTPREDEFINED:
 			print(f'error value: {value} {name}')
 		values = valList.setdefault(value, [])
 		if values:

scintilla/scripts/HFacerLexer.py

@@ -41,7 +41,7 @@ def printLexHFile(f):
 				if name.startswith("SCE_"):
 					if autoValue == STYLE_FIRSTPREDEFINED:
 						autoValue = STYLE_LASTPREDEFINED + 1
-					if val >= STYLE_FIRSTPREDEFINED and val <= STYLE_LASTPREDEFINED:
+					if STYLE_FIRSTPREDEFINED <= val <= STYLE_LASTPREDEFINED:
 						raise ValueError(f"Invalid Style Value: {name} = {val}")
 				out.append(f"#define {name} {value}")
 	return out

scintilla/scripts/HeaderCheck.py

@@ -25,7 +25,7 @@ def ExcludeName(name, excludes):
     return any(exclude in name for exclude in excludes)
 
 def SortLike(incs, order):
-    return sorted(incs, key = lambda i: order.index(i))
+    return sorted(incs, key = order.index)
 
 basePrefix = "//base:"
 sourcePrefix = "//source:"

scintilla/scripts/LaTeXInput.py

@@ -1,4 +1,3 @@
-import sys
 import os.path
 import re
 import string
@@ -159,12 +158,10 @@ def update_latex_input_data_hash(input_name, input_map, multiplier, hash_size):
 			items = hash_map[hash_key]
 			items.sort(key=lambda m: (m['magic'], m['hash_key']))
 			collision = len(items)
-			if collision > max_collision:
-				max_collision = collision
+			max_collision = max(max_collision, collision)
 			counter = fast_counter(info['magic'] for info in items)
 			comparison = max(counter.values())
-			if comparison > max_comparison:
-				max_comparison = comparison
+			max_collision = max(max_comparison, comparison)
 
 			if BuildDataForLookupOnly:
 				key_list = [info['sequence'][1:] for info in items]

scintilla/scripts/MultiStageTable.py

@@ -540,8 +540,8 @@ def runBlockEncode(head, table, tableName=''):
 	blockSize = 1 << shift
 	print(f'{head} run block value bit: {totalBit} {valueBit}, length: {len(values)}, size: {minSize} {minSize/1024}, block: {len(blockList)} {blockSize}')
 
+	output = []
 	if tableName and (len(table) & (blockSize - 1)) == 0:
-		output = []
 		mask = (1 << valueBit) - 1
 		for value in values:
 			index = value & mask
@@ -555,7 +555,7 @@ def runBlockEncode(head, table, tableName=''):
 		output = []
 		blockData = list(itertools.chain.from_iterable(blockList))
 		_dumpRunBlock(output, tableName, values, blockData, valueBit, shift)
-		return output
+	return output
 
 def skipBlockEncode(head, table, tableName=''):
 	itemSize = getItemSize(table)
@@ -590,6 +590,7 @@ def skipBlockEncode(head, table, tableName=''):
 	blockSize = 1 << shift
 	print(f'{head} skip block lookup: {length} {length.bit_length()}, size: {minSize} {minSize/1024}, block: {len(blockList)} {blockSize} default: {defaultValue}')
 
+	output = []
 	if tableName and defaultBlock and (len(table) & (blockSize - 1)) == 0:
 		bitCount = (len(blockList) - 1).bit_length()
 		offsetList = []
@@ -606,11 +607,10 @@ def skipBlockEncode(head, table, tableName=''):
 		assert minSize == size, (minSize, size)
 		assert output == table
 
-		output = []
 		if defaultValue:
 			output.append(f'constexpr {_sizeTypeMap[itemSize]} {tableName}DefaultValue = {defaultValue};')
 		_dumpRunBlock(output, tableName, offsetList, blockData, bitCount, shift)
-		return output
+	return output
 
 def _compressTableMergedEx(table, itemSize, level):
 	minSize = sys.maxsize

tools/AccessKey.py

@@ -43,7 +43,7 @@ def find_free_access_key(menu, path):
 			print('Error:', line)
 			continue
 
-		if end_cut > 0 and end_cut < end:
+		if 0 < end_cut < end:
 			end = end_cut
 
 		used = line.endswith('//#')

tools/KeywordCore.py

@@ -184,7 +184,7 @@ def sub_extract(pattern, doc, flags=0):
 	def extract(m):
 		lines.append(m.group(0))
 		return ''
-	doc = re.sub(pattern, lambda m: extract(m), doc, flags=flags)
+	doc = re.sub(pattern, extract, doc, flags=flags)
 	return doc, '\n'.join(lines)
 
 def split_api_section(doc, comment, commentKind=0):

tools/Misc.py

@@ -1,4 +1,3 @@
-import sys
 import os.path
 import re
 import json
@@ -33,7 +32,7 @@ def get_value():
 
 def check_encoding_list(path):
 	def is_tag_char(ch):
-		return (ch >= 'a' and ch <= 'z') or (ch >= '0' and ch <= '9')
+		return ('a' <= ch <= 'z') or ('0' <= ch <= '9')
 
 	with open(path, encoding='utf-8', newline='\n') as fd:
 		doc = fd.read()