PEP8 double aggressive E225 ~ E228 and E231

lib/python/Components/AVSwitch.py

@@ -20,18 +20,18 @@ def setSystem(self, value):
 	def getOutputAspect(self):
 		valstr = config.av.aspectratio.value
 		if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
-			return (4,3)
+			return (4, 3)
 		elif valstr == "16_9": # auto ... 4:3 or 16:9
 			try:
 				if "1" in open("/proc/stb/vmpeg/0/aspect", "r").read(): # 4:3
-					return (4,3)
+					return (4, 3)
 			except IOError:
 				pass
 		elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
 			pass
 		elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10
-			return (16,10)
-		return (16,9)
+			return (16, 10)
+		return (16, 9)
 
 	def getFramebufferScale(self):
 		aspect = self.getOutputAspect()
@@ -196,7 +196,7 @@ def setAACDownmix(configElement):
 	if SystemInfo["CanChangeOsdAlpha"]:
 		def setAlpha(config):
 			open("/proc/stb/video/alpha", "w").write(str(config.value))
-		config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255))
+		config.av.osd_alpha = ConfigSlider(default=255, limits=(0, 255))
 		config.av.osd_alpha.addNotifier(setAlpha)
 
 	if os.path.exists("/proc/stb/vmpeg/0/pep_scaler_sharpness"):
@@ -209,7 +209,7 @@ def setScaler_sharpness(config):
 			except IOError:
 				print "couldn't write pep_scaler_sharpness"
 
-		config.av.scaler_sharpness = ConfigSlider(default=13, limits=(0,26))
+		config.av.scaler_sharpness = ConfigSlider(default=13, limits=(0, 26))
 		config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
 	else:
 		config.av.scaler_sharpness = NoSave(ConfigNothing())

lib/python/Components/About.py

@@ -26,7 +26,7 @@ def getFlashDateString():
 def getBuildDateString():
 	try:
 		if os.path.isfile('/etc/version'):
-			version = open("/etc/version","r").read()
+			version = open("/etc/version", "r").read()
 			return "%s-%s-%s" % (version[:4], version[4:6], version[6:8])
 	except:
 		pass
@@ -53,21 +53,21 @@ def getGStreamerVersionString():
 	try:
 		from glob import glob
 		gst = [x.split("Version: ") for x in open(glob("/var/lib/opkg/info/gstreamer[0-9].[0-9].control")[0], "r") if x.startswith("Version:")][0]
-		return "%s" % gst[1].split("+")[0].replace("\n","")
+		return "%s" % gst[1].split("+")[0].replace("\n", "")
 	except:
 		return _("Not Installed")
 
 def getffmpegVersionString():
 	try:
 		from glob import glob
 		ffmpeg = [x.split("Version: ") for x in open(glob("/var/lib/opkg/info/ffmpeg.control")[0], "r") if x.startswith("Version:")][0]
-		return "%s" % ffmpeg[1].split("-")[0].replace("\n","")
+		return "%s" % ffmpeg[1].split("-")[0].replace("\n", "")
 	except:
 		return _("Not Installed")
 
 def getKernelVersionString():
 	try:
-		return open("/proc/version","r").read().split(' ', 4)[2].split('-',2)[0]
+		return open("/proc/version", "r").read().split(' ', 4)[2].split('-', 2)[0]
 	except:
 		return _("unknown")
 
@@ -110,11 +110,11 @@ def getCPUInfoString():
 
 		temperature = None
 		if os.path.isfile('/proc/stb/fp/temp_sensor_avs'):
-			temperature = open("/proc/stb/fp/temp_sensor_avs").readline().replace('\n','')
+			temperature = open("/proc/stb/fp/temp_sensor_avs").readline().replace('\n', '')
 		elif os.path.isfile('/proc/stb/power/avs'):
-			temperature = open("/proc/stb/power/avs").readline().replace('\n','')
+			temperature = open("/proc/stb/power/avs").readline().replace('\n', '')
 		elif os.path.isfile('/proc/stb/fp/temp_sensor'):
-			temperature = open("/proc/stb/fp/temp_sensor").readline().replace('\n','')
+			temperature = open("/proc/stb/fp/temp_sensor").readline().replace('\n', '')
 		elif os.path.isfile("/sys/devices/virtual/thermal/thermal_zone0/temp"):
 			try:
 				temperature = int(open("/sys/devices/virtual/thermal/thermal_zone0/temp").read().strip()) / 1000
@@ -140,10 +140,10 @@ def getDriverInstalledDate():
 		except:
 			try:
 				driver = [x.split("Version:") for x in open(glob("/var/lib/opkg/info/*-dvb-proxy-*.control")[0], "r") if x.startswith("Version:")][0]
-				return "%s" % driver[1].replace("\n","")
+				return "%s" % driver[1].replace("\n", "")
 			except:
 				driver = [x.split("Version:") for x in open(glob("/var/lib/opkg/info/*-platform-util-*.control")[0], "r") if x.startswith("Version:")][0]
-				return "%s" % driver[1].replace("\n","")
+				return "%s" % driver[1].replace("\n", "")
 	except:
 		return _("unknown")
 
@@ -197,7 +197,7 @@ def getBoxUptime():
 		if secs > 86400:
 			days = secs / 86400
 			secs = secs % 86400
-			time = ngettext("%d day","%d days", days) % days + " "
+			time = ngettext("%d day", "%d days", days) % days + " "
 		h = secs / 3600
 		m = (secs % 3600) / 60
 		time += ngettext("%d hour", "%d hours", h) % h + " "

lib/python/Components/ChoiceList.py

@@ -7,11 +7,11 @@
 def ChoiceEntryComponent(key=None, text=["--"]):
 	res = [text]
 	if text[0] == "--":
-		x, y, w, h = skin.parameters.get("ChoicelistDash",(0, 0, 800, 25))
+		x, y, w, h = skin.parameters.get("ChoicelistDash", (0, 0, 800, 25))
 		res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, "-" * 200))
 	else:
 		if key:
-			x, y, w, h = skin.parameters.get("ChoicelistName",(45, 0, 800, 25))
+			x, y, w, h = skin.parameters.get("ChoicelistName", (45, 0, 800, 25))
 			res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, text[0]))
 			if key == "dummy":
 				png = None
@@ -26,10 +26,10 @@ def ChoiceEntryComponent(key=None, text=["--"]):
 			else:
 				png = LoadPixmap(resolveFilename(SCOPE_CURRENT_SKIN, "buttons/key_%s.png" % key))
 			if png:
-				x, y, w, h = skin.parameters.get("ChoicelistIcon",(5, 0, 35, 25))
+				x, y, w, h = skin.parameters.get("ChoicelistIcon", (5, 0, 35, 25))
 				res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, x, y, w, h, png))
 		else:
-			x, y, w, h = skin.parameters.get("ChoicelistNameSingle",(5, 0, 800, 25))
+			x, y, w, h = skin.parameters.get("ChoicelistNameSingle", (5, 0, 800, 25))
 			res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, text[0]))
 	return res
 

lib/python/Components/Converter/EventName.py

@@ -115,7 +115,7 @@ def getText(self):
 			description = event.getShortDescription()
 			extended = event.getExtendedDescription()
 			if description and extended:
-				if description.replace('\n','') == extended.replace('\n',''):
+				if description.replace('\n', '') == extended.replace('\n', ''):
 					return extended
 				description += '\n'
 			return description + extended
@@ -145,7 +145,7 @@ def getText(self):
 					return _("running")
 				if running_status == 5:
 					return _("service off-air")
-				if running_status in (6,7):
+				if running_status in (6, 7):
 					return _("reserved for future use")
 				return _("undefined")
 			return ""

lib/python/Components/Converter/SensorToText.py

@@ -9,7 +9,7 @@ def getText(self):
 			return ""
 		mark = " "
 		unit = self.source.getUnit()
-		if unit in ('C','F'):
+		if unit in ('C', 'F'):
 			mark = str('\xc2\xb0')
 		return "%d%s%s" % (self.source.getValue(), mark, unit)
 

lib/python/Components/Converter/ServiceInfo.py

@@ -67,7 +67,7 @@ def __init__(self, type):
 				"Sid": (self.SID, (iPlayableService.evUpdatedInfo,)),
 				"Framerate": (self.FRAMERATE, (iPlayableService.evVideoSizeChanged, iPlayableService.evUpdatedInfo)),
 				"TransferBPS": (self.TRANSFERBPS, (iPlayableService.evUpdatedInfo)),
-				"HasHBBTV": (self.HAS_HBBTV, (iPlayableService.evUpdatedInfo,iPlayableService.evHBBTVInfo, iPlayableService.evStart)),
+				"HasHBBTV": (self.HAS_HBBTV, (iPlayableService.evUpdatedInfo, iPlayableService.evHBBTVInfo, iPlayableService.evStart)),
 				"AudioTracksAvailable": (self.AUDIOTRACKS_AVAILABLE, (iPlayableService.evUpdatedInfo, iPlayableService.evStart)),
 				"SubtitlesAvailable": (self.SUBTITLES_AVAILABLE, (iPlayableService.evUpdatedInfo, iPlayableService.evStart)),
 				"Editmode": (self.EDITMODE, (iPlayableService.evUpdatedInfo, iPlayableService.evStart)),
@@ -85,7 +85,7 @@ def __init__(self, type):
 				"IsHLG": (self.IS_HLG, (iPlayableService.evVideoGammaChanged, iPlayableService.evUpdatedInfo)),
 				"IsVideoMPEG2": (self.IS_VIDEO_MPEG2, (iPlayableService.evUpdatedInfo,)),
 				"IsVideoAVC": (self.IS_VIDEO_AVC, (iPlayableService.evUpdatedInfo,)),
-				"IsVideoHEVC": (self.IS_VIDEO_HEVC,(iPlayableService.evUpdatedInfo,)),
+				"IsVideoHEVC": (self.IS_VIDEO_HEVC, (iPlayableService.evUpdatedInfo,)),
 			}[type]
 		if self.type in (self.IS_SD, self.IS_HD, self.IS_SD_AND_WIDESCREEN, self.IS_SD_AND_NOT_WIDESCREEN, self.IS_4K, self.IS_1080, self.IS_720):
 			self.videoHeight = None

lib/python/Components/Converter/TransponderInfo.py

@@ -28,7 +28,7 @@ def getText(self):
 				ref = nref
 				info = eServiceCenter.getInstance().info(ref)
 			transponderraw = info.getInfoObject(ref, iServiceInformation.sTransponderData)
-			ref = ref.toString().replace("%3a",":")
+			ref = ref.toString().replace("%3a", ":")
 		else:
 			transponderraw = info.getInfoObject(iServiceInformation.sTransponderData)
 			ref = info.getInfoString(iServiceInformation.sServiceref)

lib/python/Components/EpgList.py

@@ -238,7 +238,7 @@ def buildSingleEntry(self, service, eventId, beginTime, duration, EventName):
 		res = [
 			None, # no private data needed
 			(eListboxPythonMultiContent.TYPE_TEXT, r1.x, r1.y, r1.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, self.days[t[6]]),
-			(eListboxPythonMultiContent.TYPE_TEXT, r2.x, r2.y, r2.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, "%02d.%02d, %02d:%02d" % (t[2],t[1],t[3],t[4]))
+			(eListboxPythonMultiContent.TYPE_TEXT, r2.x, r2.y, r2.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, "%02d.%02d, %02d:%02d" % (t[2], t[1], t[3], t[4]))
 		]
 		if clock_types:
 			for i in range(len(clock_types)):
@@ -257,7 +257,7 @@ def buildSimilarEntry(self, service, eventId, beginTime, service_name, duration)
 		res = [
 			None,  # no private data needed
 			(eListboxPythonMultiContent.TYPE_TEXT, r1.x, r1.y, r1.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, self.days[t[6]]),
-			(eListboxPythonMultiContent.TYPE_TEXT, r2.x, r2.y, r2.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, "%2d.%02d, %02d:%02d" % (t[2],t[1],t[3],t[4]))
+			(eListboxPythonMultiContent.TYPE_TEXT, r2.x, r2.y, r2.w, r1.h, 0, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, "%2d.%02d, %02d:%02d" % (t[2], t[1], t[3], t[4]))
 		]
 		if clock_types:
 			for i in range(len(clock_types)):
@@ -285,7 +285,7 @@ def buildMultiEntry(self, changecount, service, eventId, beginTime, duration, Ev
 				begin = localtime(beginTime)
 				end = localtime(beginTime + duration)
 				res.extend((
-					(eListboxPythonMultiContent.TYPE_TEXT, r4.x, r4.y, r4.w, r4.h, 1, RT_HALIGN_CENTER | RT_VALIGN_CENTER, "%02d.%02d - %02d.%02d" % (begin[3],begin[4],end[3],end[4])),
+					(eListboxPythonMultiContent.TYPE_TEXT, r4.x, r4.y, r4.w, r4.h, 1, RT_HALIGN_CENTER | RT_VALIGN_CENTER, "%02d.%02d - %02d.%02d" % (begin[3], begin[4], end[3], end[4])),
 					(eListboxPythonMultiContent.TYPE_TEXT, r3.x, r3.y, self.gap(self.tw), r3.h, 1, RT_HALIGN_RIGHT | RT_VALIGN_CENTER, _("%d min") % (duration / 60)),
 					(eListboxPythonMultiContent.TYPE_TEXT, r3.x + self.tw, r3.y, r3.w, r3.h, 0, RT_HALIGN_LEFT | RT_VALIGN_CENTER, EventName)
 				))
@@ -366,7 +366,7 @@ def getSelectedEventId(self):
 		x = self.l.getCurrentSelection()
 		return x and x[1]
 
-	def moveToService(self,serviceref):
+	def moveToService(self, serviceref):
 		if not serviceref:
 			return
 		index = 0
@@ -403,9 +403,9 @@ def applySkin(self, desktop, parent):
 		def warningWrongSkinParameter(string):
 			print "[EPGList] wrong '%s' skin parameters" % string
 		def setEventItemFont(value):
-			self.eventItemFont = parseFont(value, ((1,1),(1,1)))
+			self.eventItemFont = parseFont(value, ((1, 1), (1, 1)))
 		def setEventTimeFont(value):
-			self.eventTimeFont = parseFont(value, ((1,1),(1,1)))
+			self.eventTimeFont = parseFont(value, ((1, 1), (1, 1)))
 		def setIconDistance(value):
 			self.iconDistance = int(value)
 		def setIconShift(value):

lib/python/Components/FileList.py

@@ -64,7 +64,7 @@
 
 def FileEntryComponent(name, absolute=None, isDir=False):
 	res = [(absolute, isDir)]
-	x, y, w, h = skin.parameters.get("FileListName",(35, 1, 600, 20))
+	x, y, w, h = skin.parameters.get("FileListName", (35, 1, 600, 20))
 	res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, name))
 	if isDir:
 		png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "extensions/directory.png"))
@@ -76,7 +76,7 @@ def FileEntryComponent(name, absolute=None, isDir=False):
 		else:
 			png = None
 	if png is not None:
-		x, y, w, h = skin.parameters.get("FileListIcon",(10, 2, 20, 20))
+		x, y, w, h = skin.parameters.get("FileListIcon", (10, 2, 20, 20))
 		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, x, y, w, h, png))
 
 	return res
@@ -300,7 +300,7 @@ def partitionListChanged(self, action, device):
 
 def MultiFileSelectEntryComponent(name, absolute=None, isDir=False, selected=False):
 	res = [(absolute, isDir, selected, name)]
-	x, y, w, h = skin.parameters.get("FileListMultiName",(55, 0, 600, 25))
+	x, y, w, h = skin.parameters.get("FileListMultiName", (55, 0, 600, 25))
 	res.append((eListboxPythonMultiContent.TYPE_TEXT, x, y, w, h, 0, RT_HALIGN_LEFT, name))
 	if isDir:
 		png = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "extensions/directory.png"))
@@ -312,14 +312,14 @@ def MultiFileSelectEntryComponent(name, absolute=None, isDir=False, selected=Fal
 		else:
 			png = None
 	if png is not None:
-		x, y, w, h = skin.parameters.get("FileListMultiIcon",(30, 2, 20, 20))
+		x, y, w, h = skin.parameters.get("FileListMultiIcon", (30, 2, 20, 20))
 		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, x, y, w, h, png))
 	if not name.startswith('<'):
 		if selected:
 			icon = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "icons/lock_on.png"))
 		else:
 			icon = LoadPixmap(cached=True, path=resolveFilename(SCOPE_CURRENT_SKIN, "icons/lock_off.png"))
-		x, y, w, h = skin.parameters.get("FileListMultiLock",(2, 0, 25, 25))
+		x, y, w, h = skin.parameters.get("FileListMultiLock", (2, 0, 25, 25))
 		res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHABLEND, x, y, w, h, icon))
 	return res
 

lib/python/Components/Harddisk.py

@@ -374,7 +374,7 @@ def createInitializeJob(self):
 			task.setTool("mkfs.ext4")
 			if size > 20000:
 				try:
-					version = map(int, open("/proc/version","r").read().split(' ', 4)[2].split('.',2)[:2])
+					version = map(int, open("/proc/version", "r").read().split(' ', 4)[2].split('.', 2)[:2])
 					if (version[0] > 3) or (version[0] > 2 and version[1] >= 2):
 						# Linux version 3.2 supports bigalloc and -C option, use 256k blocks
 						task.args += ["-C", "262144"]
@@ -447,8 +447,8 @@ def readStats(self):
 		try:
 			l = open("/sys/block/%s/stat" % self.device).read()
 		except IOError:
-			return -1,-1
-		data = l.split(None,5)
+			return -1, -1
+		data = l.split(None, 5)
 		return (int(data[0]), int(data[4]))
 
 	def startIdle(self):
@@ -510,7 +510,7 @@ def __init__(self, mountpoint, device=None, description="", force_mounted=False)
 		self.is_hotplug = force_mounted # so far; this might change.
 		self.device = device
 	def __str__(self):
-		return "Partition(mountpoint=%s,description=%s,device=%s)" % (self.mountpoint,self.description,self.device)
+		return "Partition(mountpoint=%s,description=%s,device=%s)" % (self.mountpoint, self.description, self.device)
 
 	def stat(self):
 		if self.mountpoint:
@@ -596,7 +596,7 @@ def __init__(self):
 			("/", _("Internal flash"))
 		)
 		known = set([os.path.normpath(a.mountpoint) for a in self.partitions if a.mountpoint])
-		for m,d in p:
+		for m, d in p:
 			if (m not in known) and os.path.ismount(m):
 				self.partitions.append(Partition(mountpoint=m, description=d))
 
@@ -889,9 +889,9 @@ def processOutput(self, data):
 		elif self.fsck_state == 'inode':
 			if '/' in data:
 				try:
-					d = data.strip(' \x08\r\n').split('/',1)
+					d = data.strip(' \x08\r\n').split('/', 1)
 					if '\x08' in d[1]:
-						d[1] = d[1].split('\x08',1)[0]
+						d[1] = d[1].split('\x08', 1)[0]
 					self.setProgress(80 * int(d[0]) / int(d[1]))
 				except Exception, e:
 					print "[Mkfs] E:", e