PEP8: Fix whitespace
authorMike Looijmans <milo@openpli.org>
Sun, 3 Jan 2016 13:22:45 +0000 (14:22 +0100)
committerMike Looijmans <milo@openpli.org>
Sun, 3 Jan 2016 13:28:09 +0000 (14:28 +0100)
This is the result of running the following command:
autopep8 -r -i --select=W293,W291,W391 .

This just adds missing newlines at the end of files, and removes
trailing whitespace so future PEP8 runs will have less differences.

76 files changed:
lib/python/Components/AVSwitch.py
lib/python/Components/Converter/ClientsStreaming.py
lib/python/Components/Converter/EventName.py
lib/python/Components/Converter/PliExtraInfo.py
lib/python/Components/Converter/RotorPosition.py
lib/python/Components/Converter/ServiceName.py
lib/python/Components/Converter/StaticText.py
lib/python/Components/Converter/TransponderInfo.py
lib/python/Components/Converter/ValueToPixmap.py
lib/python/Components/HTMLComponent.py
lib/python/Components/HTMLSkin.py
lib/python/Components/Label.py
lib/python/Components/Lcd.py
lib/python/Components/MovieList.py
lib/python/Components/Netlink.py
lib/python/Components/NimManager.py
lib/python/Components/ParentalControl.py
lib/python/Components/Playlist.py
lib/python/Components/Renderer/ChannelNumber.py
lib/python/Components/Renderer/Label.py
lib/python/Components/Renderer/NextEpgInfo.py
lib/python/Components/Renderer/Pig.py
lib/python/Components/Renderer/Pixmap.py
lib/python/Components/Renderer/VideoSize.py
lib/python/Components/ResourceManager.py
lib/python/Components/ServiceList.py
lib/python/Components/Sources/CurrentService.py
lib/python/Components/Sources/EventInfo.py
lib/python/Components/Sources/FrontendStatus.py
lib/python/Components/Sources/Source.py
lib/python/Components/TuneTest.py
lib/python/Components/UsageConfig.py
lib/python/Components/VideoWindow.py
lib/python/Plugins/Extensions/DVDBurn/DVDTitle.py
lib/python/Plugins/Extensions/DVDBurn/ProjectSettings.py
lib/python/Plugins/Extensions/DVDPlayer/__init__.py
lib/python/Plugins/Extensions/GraphMultiEPG/GraphMultiEpg.py
lib/python/Plugins/Extensions/MediaPlayer/__init__.py
lib/python/Plugins/Extensions/PicturePlayer/ui.py
lib/python/Plugins/Extensions/SocketMMI/SocketMMI.py
lib/python/Plugins/Extensions/SocketMMI/__init__.py
lib/python/Plugins/Extensions/SocketMMI/plugin.py
lib/python/Plugins/SystemPlugins/DiseqcTester/plugin.py
lib/python/Plugins/SystemPlugins/OSD3DSetup/plugin.py
lib/python/Plugins/SystemPlugins/PositionerSetup/plugin.py
lib/python/Plugins/SystemPlugins/SoftwareManager/ImageWizard.py
lib/python/Plugins/SystemPlugins/TempFanControl/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/ClockDisplay.py
lib/python/Screens/ConfigMenu.py
lib/python/Screens/EpgSelection.py
lib/python/Screens/FactoryReset.py
lib/python/Screens/Hotkey.py
lib/python/Screens/InfoBar.py
lib/python/Screens/InfoBarGenerics.py
lib/python/Screens/InputBox.py
lib/python/Screens/LocationBox.py
lib/python/Screens/MinuteInput.py
lib/python/Screens/MovieSelection.py
lib/python/Screens/Mute.py
lib/python/Screens/NetworkSetup.py
lib/python/Screens/PVRState.py
lib/python/Screens/Satconfig.py
lib/python/Screens/ServiceStopScreen.py
lib/python/Screens/SimpleSummary.py
lib/python/Screens/SleepTimerEdit.py
lib/python/Screens/TimerEntry.py
lib/python/Tools/Alternatives.py
lib/python/Tools/TextBoundary.py
lib/python/Tools/Transponder.py
lib/python/enigma_py_patcher.py
tools/host_tools/FormatConverter/datasource.py
tools/host_tools/FormatConverter/input.py
tools/host_tools/FormatConverter/lamedb2satxml.py
tools/host_tools/FormatConverter/main.py
tools/host_tools/FormatConverter/satxml.py

index 1f4fa5e..10eb420 100644 (file)
@@ -209,4 +209,3 @@ def InitAVSwitch():
                config.av.scaler_sharpness.addNotifier(setScaler_sharpness)
        else:
                config.av.scaler_sharpness = NoSave(ConfigNothing())
-
index 71fc923..fe7a0c1 100644 (file)
@@ -128,4 +128,3 @@ class ClientsStreaming(Converter, Poll, object):
 
        def doSuspend(self, suspended):
                pass
-
index bb6fbc9..3f52ff7 100644 (file)
@@ -148,4 +148,4 @@ class EventName(Converter, object):
                                return "undefined"
                        return ""
 
-       text = property(getText)
\ No newline at end of file
+       text = property(getText)
index fbf9fdc..8087b25 100644 (file)
@@ -385,4 +385,3 @@ class PliExtraInfo(Poll, Converter, object):
                elif what[0] == self.CHANGED_POLL and self.updateFEdata is not None:
                        self.updateFEdata = False
                        Converter.changed(self, what)
-
index 686247a..092211c 100644 (file)
@@ -70,4 +70,4 @@ class RotorPosition(Converter, object):
                        Converter.changed(self, (self.CHANGED_ALL,))
 
        def show_hide(self, configElement=None):
-               Converter.changed(self, (self.CHANGED_ALL,))
\ No newline at end of file
+               Converter.changed(self, (self.CHANGED_ALL,))
index c0ae6e9..34f781f 100644 (file)
@@ -52,4 +52,4 @@ class ServiceName(Converter, object):
 
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] in (iPlayableService.evStart,):
-                       Converter.changed(self, what)
\ No newline at end of file
+                       Converter.changed(self, what)
index d3a67b2..1b69bfa 100644 (file)
@@ -4,4 +4,3 @@ class StaticText(Converter, object):
        def __init__(self, text):
                Converter.__init__(self, type)
                self.text = str(text)
-
index 0824deb..62f7de0 100644 (file)
@@ -68,4 +68,3 @@ class TransponderInfo(Converter, object):
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] in (iPlayableService.evStart,):
                        Converter.changed(self, what)
-
index 66e6c68..b3e1606 100644 (file)
@@ -37,4 +37,3 @@ class ValueToPixmap(Converter, object):
        def changed(self, what):
                if what[0] != self.CHANGED_SPECIFIC or what[1] == self.type:
                        Converter.changed(self, what)
-
index bef518e..233a099 100644 (file)
@@ -2,4 +2,3 @@
 class HTMLComponent:
        def produceHTML(self):
                return ""
-
index 913c90e..bf9c1ec 100644 (file)
@@ -10,4 +10,3 @@ class HTMLSkin:
                        res += self[name].produceHTML()
                res += "</html>\n";
                return res
-
index 1efce8f..12be286 100644 (file)
@@ -98,4 +98,3 @@ class MultiColorLabel(Label):
                                self.instance.setBackgroundColor(self.backColors[x])
                        else:
                                print "setBackgroundColorNum(%d) failed! defined colors:" %(x), self.backColors
-
index a6d1b32..41b8c86 100644 (file)
@@ -109,4 +109,3 @@ def InitLcd():
                config.lcd.standby.apply = lambda : doNothing()
 
        config.misc.standbyCounter.addNotifier(standbyCounterChanged, initial_call = False)
-
index f9eaf67..1ab3fcc 100644 (file)
@@ -774,7 +774,7 @@ class MovieList(GUIComponent):
                if ref.flags & eServiceReference.mustDescent:
                        return (0, x[1] and x[1].getName(ref).lower() or "")
                return (1, -x[2])
-               
+
        def buildGroupwiseSortkey(self, x):
                # Sort recordings by date, sort MP3 and stuff by name
                ref = x[0]
index 8fe9788..026f420 100644 (file)
@@ -30,4 +30,4 @@ if __name__ == '__main__':
        print "socket no:", nls.fileno()
        while 1:
                for item in nls.parse():
-                       print repr(item)
\ No newline at end of file
+                       print repr(item)
index d5e4b05..201c717 100644 (file)
@@ -207,7 +207,7 @@ class SecConfigure:
                                                print "[SecConfigure] diseqcmode: ", nim.diseqcMode.value
                                                if nim.diseqcMode.value == "single":                    #single
                                                        currentCircular = False
-                                                       if nim.diseqcA.value in ("360", "560"): 
+                                                       if nim.diseqcA.value in ("360", "560"):
                                                                currentCircular = nim.simpleDiSEqCSetCircularLNB.value
                                                        if nim.simpleSingleSendDiSEqC.value:
                                                                self.addLNBSimple(sec, slotid = x, orbpos = nim.diseqcA.orbital_position, toneburstmode = diseqcParam.NO, diseqcmode = diseqcParam.V1_0, diseqcpos = diseqcParam.AA, diseqc13V = nim.diseqc13V.value, CircularLNB = currentCircular)
@@ -990,7 +990,7 @@ class NimManager:
                                if dm == "positioner":
                                        for x in self.satList:
                                                list.append(x)
-                               if dm == "positioner_select": 
+                               if dm == "positioner_select":
                                        userSatlist = nim.userSatellitesList.value
                                        userSatlist = userSatlist.replace("]", "").replace("[", "")
                                        for x in self.satList:
index 6bf2d44..40ef2de 100644 (file)
@@ -274,4 +274,4 @@ class ParentalControl:
                                for ref in self.blacklist:
                                        if TYPE_BOUQUET not in ref:
                                                eDVBDB.getInstance().removeFlag(eServiceReference(ref), 2)
-                       refreshServiceList()
\ No newline at end of file
+                       refreshServiceList()
index 9e42c03..5dd0080 100644 (file)
@@ -125,4 +125,4 @@ class PlaylistIOPLS(PlaylistIO):
                return self.list
 
        def save(self, filename = None):
-               return self.ERROR
\ No newline at end of file
+               return self.ERROR
index a8fadf7..ea3550c 100644 (file)
@@ -17,4 +17,3 @@ class ChannelNumber(Renderer, VariableText):
                                self.text = str(num)
                        else:
                                self.text = '---'
-
index e660de1..3813ce2 100644 (file)
@@ -19,4 +19,3 @@ class Label(VariableText, Renderer):
                        self.text = ""
                else:
                        self.text = self.source.text
-
index 06a8bea..9b43fe4 100644 (file)
@@ -19,4 +19,4 @@ class NextEpgInfo(Renderer, VariableText):
                nextEvent = self.epgcache.lookupEvent(['IBDCTSERNX', (reference.toString(), 1, -1)])
                if nextEvent:
                        if nextEvent[0][4]:
-                               self.text = pgettext("now/next: 'next' event label", "Next") + ": " + nextEvent[0][4]
\ No newline at end of file
+                               self.text = pgettext("now/next: 'next' event label", "Next") + ": " + nextEvent[0][4]
index 3af7afd..d0c0294 100644 (file)
@@ -43,4 +43,4 @@ class Pig(Renderer):
        def onHide(self):
                if self.instance:
                        self.preWidgetRemove(self.instance)
-                       self.hidePip and PipPigMode(False)
\ No newline at end of file
+                       self.hidePip and PipPigMode(False)
index 7c6b579..32b615d 100644 (file)
@@ -16,4 +16,3 @@ class Pixmap(Renderer):
                        if self.source and hasattr(self.source, "pixmap"):
                                if self.instance:
                                        self.instance.setPixmap(self.source.pixmap)
-
index a133bce..a2eae65 100644 (file)
@@ -24,4 +24,3 @@ class VideoSize(Renderer, VariableText):
                        self.text = str(xresol)+'x'+str(yresol)
                else:
                        self.text = ''
-
index 8307fcd..69a2e30 100644 (file)
@@ -20,4 +20,4 @@ class ResourceManager:
                if self.hasResource(name):
                        del self.resourceList[name]
 
-resourcemanager = ResourceManager()
\ No newline at end of file
+resourcemanager = ResourceManager()
index 2c3b702..0e4da55 100644 (file)
@@ -163,7 +163,7 @@ class ServiceList(HTMLComponent, GUIComponent):
                                                config.servicelist.lastmode.save()
                                                self.serviceList.saveChannel(ref)
                                                return True
-                               self.serviceList.enterUserbouquet(revert_tv_root)       
+                               self.serviceList.enterUserbouquet(revert_tv_root)
                                self.serviceList.setModeRadio()
                                revert_radio_root = self.getRoot()
                                bouquets = self.serviceList.getBouquetList()
@@ -173,7 +173,7 @@ class ServiceList(HTMLComponent, GUIComponent):
                                                config.servicelist.lastmode.save()
                                                self.serviceList.saveChannel(ref)
                                                return True
-                               self.serviceList.enterUserbouquet(revert_radio_root)            
+                               self.serviceList.enterUserbouquet(revert_radio_root)
                                print "[servicelist] service not found in any userbouquets"
                                if revert_mode == "tv":
                                        self.serviceList.setModeTv()
index d06690b..2556182 100644 (file)
@@ -42,4 +42,3 @@ class CurrentService(PerServiceBase, Source):
        def destroy(self):
                PerServiceBase.destroy(self)
                Source.destroy(self)
-
index 5f905f3..966c883 100644 (file)
@@ -39,4 +39,3 @@ class EventInfo(PerServiceBase, Source, object):
        def destroy(self):
                PerServiceBase.destroy(self)
                Source.destroy(self)
-
index 8f1b36d..0e22350 100644 (file)
@@ -51,4 +51,3 @@ class FrontendStatus(Source):
        def destroy(self):
                self.poll_timer.callback.remove(self.updateFrontendStatus)
                Source.destroy(self)
-
index 2fa4c29..6002455 100644 (file)
@@ -21,4 +21,3 @@ class ObsoleteSource(Source):
                self.new_source = new_source
                self.description = description
                self.removal_date = removal_date
-
index 8595652..b536f3d 100644 (file)
@@ -288,4 +288,4 @@ class TuneTest:
        # can be overwritten
        # progress = (range, value, status, transponder)
        def progressCallback(self, progress):
-               pass
\ No newline at end of file
+               pass
index 3ddf820..35362c2 100644 (file)
@@ -56,7 +56,7 @@ def InitUsageConfig():
        config.usage.show_infobar_on_zap = ConfigYesNo(default = True)
        config.usage.show_infobar_on_skip = ConfigYesNo(default = True)
        config.usage.show_infobar_on_event_change = ConfigYesNo(default = False)
-       config.usage.show_second_infobar = ConfigSelection(default = None, choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])     
+       config.usage.show_second_infobar = ConfigSelection(default = None, choices = [(None, _("None"))] + choicelist + [("EPG",_("EPG"))])
        config.usage.infobar_frontend_source = ConfigSelection(default = "tuner", choices = [("settings", _("Settings")), ("tuner", _("Tuner"))])
        config.usage.oldstyle_zap_controls = ConfigYesNo(default = False)
        config.usage.oldstyle_channel_select_controls = ConfigYesNo(default = False)
index 2906aa3..be1a97d 100644 (file)
@@ -12,4 +12,4 @@ class VideoWindow(GUIComponent):
 
        def postWidgetCreate(self, instance):
                instance.setDecoder(self.decoder)
-               instance.setFBSize(eSize(self.fb_width, self.fb_height));
\ No newline at end of file
+               instance.setFBSize(eSize(self.fb_width, self.fb_height));
index 7d46005..fbee95e 100644 (file)
@@ -167,4 +167,4 @@ class DVDTitle:
                        timestring = timestring.replace("$s", ("%02d" % (p % (90000 * 60) / 90000)))
                        timestring = timestring.replace("$t", ("%03d" % ((p % 90000) / 90)))
                        timestamps.append(timestring)
-               return timestamps
\ No newline at end of file
+               return timestamps
index 110e471..f9ca10c 100644 (file)
@@ -248,4 +248,4 @@ class ProjectSettings(Screen,ConfigListScreen):
                        if self.project.loadProject(self.path):
                                self.initConfigList()
                        else:
-                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
\ No newline at end of file
+                               self.session.open(MessageBox,self.project.error,MessageBox.TYPE_ERROR)
index 3f2abb0..619c4b5 100644 (file)
@@ -1226,7 +1226,7 @@ class GraphMultiEPG(Screen, HelpableScreen):
                        prev_state = timer.state
                        isRunning = prev_state in (1, 2)
                        title_text = isRepeat and _("Attention, this is repeated timer!\n") or ""
-                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay 
+                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay
                        menu = [(_("Delete timer"), "delete"),(_("Edit timer"), "edit")]
                        buttons = ["red", "green"]
                        if not isRunning:
index f8c04b7..b7473f3 100644 (file)
@@ -612,4 +612,3 @@ class Pic_Full_View(Screen):
                        getDesktop(0).resize(eSize(self.size_w, self.size_h))
 
                self.close(self.lastindex + self.dirlistcount)
-
index 65142e3..733301a 100644 (file)
@@ -30,4 +30,3 @@ class SocketMMIMessageHandler:
        def dlgClosed(self, slot):
                if slot in self.dlgs:
                        del self.dlgs[slot]
-
index 568cde2..7aef7a8 100644 (file)
@@ -25,4 +25,3 @@ def Plugins(**kwargs):
        return [ PluginDescriptor(name = "SocketMMI", description = _("Python frontend for /tmp/mmi.socket"), where = PluginDescriptor.WHERE_MENU, needsRestart = True, fnc = menu),
                PluginDescriptor(where = PluginDescriptor.WHERE_SESSIONSTART, needsRestart = True, fnc = sessionstart),
                PluginDescriptor(where = PluginDescriptor.WHERE_AUTOSTART, needsRestart = True, fnc = autostart) ]
-
index 39a2e74..946712d 100644 (file)
@@ -413,7 +413,7 @@ class DiseqcTester(Screen, TuneTest, ResultParser):
                        self.results[index]["status"] = status
 
                if self.results[index]["status"] != _("working"):
-                       self.results[index]["internalstatus"] = self.results[index]["status"] 
+                       self.results[index]["internalstatus"] = self.results[index]["status"]
                self.results[index]["failed"] = failedTune + self.results[index]["failed"]
                self.results[index]["successful"] = successfullyTune + self.results[index]["successful"]
 
index 698890d..615bf39 100644 (file)
@@ -141,4 +141,4 @@ def Plugins(**kwargs):
                from Plugins.Plugin import PluginDescriptor
                return [PluginDescriptor(where = [PluginDescriptor.WHERE_SESSIONSTART], fnc = autostart),
                        PluginDescriptor(name = "OSD 3D setup", description = _("Adjust 3D settings"), where = PluginDescriptor.WHERE_MENU, fnc = startSetup)]
-       return []
\ No newline at end of file
+       return []
index 413f03c..63a6750 100644 (file)
@@ -242,7 +242,7 @@ class PositionerSetup(Screen):
 
                self.updateColors("tune")
                self.statusTimer = eTimer()
-               self.rotorStatusTimer = eTimer() 
+               self.rotorStatusTimer = eTimer()
                self.statusTimer.callback.append(self.updateStatus)
                self.rotorStatusTimer.callback.append(self.startStatusTimer)
                self.collectingStatistics = False
@@ -840,7 +840,7 @@ class PositionerSetup(Screen):
                        # of 5000 the interval is multiplied by 3 until 15000 which is seen
                        # as a high symbol rate. Linear interpolation elsewhere.
                        return max(int(round((3 - 1) * (symbolrate - 15000) / (5000 - 15000) + 1)), 1)
+
                self.symbolrate = tp[1]
                self.polarisation = tp[2]
                self.MAX_LOW_RATE_ADAPTER_COUNT = setLowRateAdapterCount(self.symbolrate)
index 877401b..60a59cf 100755 (executable)
@@ -119,4 +119,3 @@ class ImageWizard(WizardLanguage, Rc):
 
 if config.misc.firstrun.value:
        wizardManager.registerWizard(ImageWizard, backupAvailable, priority = 10)
-
index ac8f105..c3246e1 100644 (file)
@@ -170,4 +170,3 @@ def startMenu(menuid):
 
 def Plugins(**kwargs):
        return PluginDescriptor(name = _("Temperature and fan control"), description = _("Temperature and fan control"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc = startMenu)
-
index 7b62007..a31cf07 100644 (file)
@@ -193,7 +193,7 @@ class ChannelContextMenu(Screen):
                                                if not self.parentalControlEnabled or self.parentalControl.getProtectionLevel(current.toCompareString()) == -1:
                                                        if self.csel.dopipzap:
                                                                append_when_current_valid(current, menu, (_("play in mainwindow"), self.playMain), level=0, key="red")
-                                                       else:   
+                                                       else:
                                                                append_when_current_valid(current, menu, (_("play as picture in picture"), self.showServiceInPiP), level=0, key="blue")
                                        append_when_current_valid(current, menu, (_("find currently played service"), self.findCurrentlyPlayed), level=0, key="3")
                                else:
@@ -451,7 +451,7 @@ class ChannelContextMenu(Screen):
                        self.csel.servicelist.setCurrent(service)
                        self.close()
                elif answer is not None:
-                       self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR)   
+                       self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR)
                else:
                        self.close()
 
@@ -1516,10 +1516,10 @@ class ChannelSelectionBase(Screen):
                                                        if service_type:
                                                                if unsigned_orbpos == 0xFFFF: #Cable
                                                                        service_name = _("Cable")
-                                                                       addCableAndTerrestrialLater.append(("%s - %s" % (service_name, service_type), service.toString()))                      
+                                                                       addCableAndTerrestrialLater.append(("%s - %s" % (service_name, service_type), service.toString()))
                                                                elif unsigned_orbpos == 0xEEEE: #Terrestrial
                                                                        service_name = _("Terrestrial")
-                                                                       addCableAndTerrestrialLater.append(("%s - %s" % (service_name, service_type), service.toString()))                      
+                                                                       addCableAndTerrestrialLater.append(("%s - %s" % (service_name, service_type), service.toString()))
                                                                else:
                                                                        try:
                                                                                service_name = str(nimmanager.getSatDescription(orbpos))
index cc9c6ce..baf5cd0 100644 (file)
@@ -12,4 +12,3 @@ class ClockDisplay(Screen):
                b.onClick = [ self.okbutton ]
                self["okbutton"] = b
                self["title"] = Header("clock dialog: here you see the current uhrzeit!")
-
index 809efc1..a81e277 100644 (file)
@@ -34,4 +34,3 @@ class configTest(Screen):
                                "ok": self["config"].toggle,
                                "cancel": self.close
                        })
-
index 1f01f3e..b6c7740 100644 (file)
@@ -308,7 +308,7 @@ class EPGSelection(Screen):
        def runningEventCallback(self, t, state, result):
                if result is not None and t.state == state:
                        findNextRunningEvent = True
-                       findEventNext = False 
+                       findEventNext = False
                        if result[1] == "nextonlystop":
                                findEventNext = True
                                t.disable()
@@ -354,7 +354,7 @@ class EPGSelection(Screen):
                        prev_state = timer.state
                        isRunning = prev_state in (1, 2)
                        title_text = isRepeat and _("Attention, this is repeated timer!\n") or ""
-                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay 
+                       firstNextRepeatEvent = isRepeat and (begin < timer.begin <= end or timer.begin <= begin <= timer.end) and not timer.justplay
                        menu = [(_("Delete timer"), "delete"),(_("Edit timer"), "edit")]
                        buttons = ["red", "green"]
                        if not isRunning:
index ebc78b4..437b361 100644 (file)
@@ -14,4 +14,4 @@ class FactoryReset(MessageBox, ProtectedScreen):
        def isProtected(self):
                return config.ParentalControl.setuppinactive.value and\
                        (not config.ParentalControl.config_sections.main_menu.value and not config.ParentalControl.config_sections.configuration.value  or hasattr(self.session, 'infobar') and self.session.infobar is None) and\
-                       config.ParentalControl.config_sections.manufacturer_reset.value
\ No newline at end of file
+                       config.ParentalControl.config_sections.manufacturer_reset.value
index 529f38d..93d77c6 100644 (file)
@@ -152,7 +152,7 @@ def getHotkeyFunctions():
                hotkeyFunctions.append((_("Swap PIP"), "Infobar/swapPiP", "InfoBar"))
                hotkeyFunctions.append((_("Move PIP"), "Infobar/movePiP", "InfoBar"))
                hotkeyFunctions.append((_("Toggle PIPzap"), "Infobar/togglePipzap", "InfoBar"))
-       hotkeyFunctions.append((_("Activate HbbTV (Redbutton)"), "Infobar/activateRedButton", "InfoBar"))               
+       hotkeyFunctions.append((_("Activate HbbTV (Redbutton)"), "Infobar/activateRedButton", "InfoBar"))
        hotkeyFunctions.append((_("Toggle HDMI In"), "Infobar/HDMIIn", "InfoBar"))
        if SystemInfo["LcdLiveTV"]:
                hotkeyFunctions.append((_("Toggle LCD LiveTV"), "Infobar/ToggleLCDLiveTV", "InfoBar"))
@@ -328,7 +328,7 @@ class HotkeySetupSelect(Screen):
                self.prevselected = self.selected[:]
                self["choosen"] = ChoiceList(list=self.selected, selection=0)
                self["list"] = ChoiceList(list=self.getFunctionList(), selection=0)
-               self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions", "KeyboardInputActions", "MenuActions"], 
+               self["actions"] = ActionMap(["OkCancelActions", "ColorActions", "DirectionActions", "KeyboardInputActions", "MenuActions"],
                {
                        "ok": self.keyOk,
                        "cancel": self.cancel,
@@ -538,7 +538,7 @@ class InfoBarHotkey():
                                pluginlist = plugins.getPlugins(PluginDescriptor.WHERE_EVENTINFO)
                                pluginlist.sort(key=lambda p: p.name)
                                for plugin in pluginlist:
-                                       if plugin.name not in twinPlugins and plugin.path and 'selectedevent' not in plugin.__call__.func_code.co_varnames:     
+                                       if plugin.name not in twinPlugins and plugin.path and 'selectedevent' not in plugin.__call__.func_code.co_varnames:
                                                if twinPaths.has_key(plugin.path[24:]):
                                                        twinPaths[plugin.path[24:]] += 1
                                                else:
index 045da4c..fdf6bec 100644 (file)
@@ -529,4 +529,4 @@ class MoviePlayer(InfoBarBase, InfoBarShowHide, InfoBarMenu, InfoBarSeek, InfoBa
                Notifications.AddPopup(text = _("%s/%s: %s") % (index, n, self.ref2HumanName(ref)), type = MessageBox.TYPE_INFO, timeout = 5)
 
        def ref2HumanName(self, ref):
-               return enigma.eServiceCenter.getInstance().info(ref).getName(ref)               
+               return enigma.eServiceCenter.getInstance().info(ref).getName(ref)
index 40d0999..1d485a3 100644 (file)
@@ -578,7 +578,7 @@ class InfoBarChannelSelection:
                                "historyBack": (self.historyBack, _("Switch to previous channel in history")),
                                "historyNext": (self.historyNext, _("Switch to next channel in history")),
                                "keyChannelUp": (self.keyChannelUpCheck, self.getKeyChannelUpHelptext),
-                               "keyChannelDown": (self.keyChannelDownCheck, self.getKeyChannelDownHelptext),   
+                               "keyChannelDown": (self.keyChannelDownCheck, self.getKeyChannelDownHelptext),
                        })
 
        def showTvChannelList(self, zap=False):
index 7cabaf3..802ca90 100644 (file)
@@ -182,4 +182,4 @@ class PinInput(InputBox):
                self["tries"].setText(self.triesEntry and _("Tries left:") + " " + str(self.getTries() or ""))
 
        def keyRight(self):
-               pass
\ No newline at end of file
+               pass
index 0cb8a0a..08271c6 100644 (file)
@@ -555,4 +555,3 @@ class TimeshiftLocationBox(LocationBox):
                        config.usage.timeshift_path.value = self.getPreferredFolder()
                        config.usage.timeshift_path.save()
                        LocationBox.selectConfirmed(self, ret)
-
index fb276d9..cb8e2e0 100644 (file)
@@ -64,4 +64,4 @@ class MinuteInput(Screen):
                        self.close(int(self["minutes"].getText()))
 
                def cancel(self):
-                       self.close(0)
\ No newline at end of file
+                       self.close(0)
index 0b431a3..f52e939 100644 (file)
@@ -701,7 +701,7 @@ class MovieSelection(Screen, HelpableScreen, SelectionEventInfo, InfoBarBase, Pr
                        parentalControl.hideBlacklist()
                        self.reloadList()
                elif answer is not None:
-                       self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR)   
+                       self.session.openWithCallback(self.close, MessageBox, _("The pin code you entered is wrong."), MessageBox.TYPE_ERROR)
 
        def asciiOn(self):
                rcinput = eRCInput.getInstance()
index f80267a..150ba2b 100644 (file)
@@ -2,4 +2,3 @@ from Screen import Screen
 
 class Mute(Screen):
        pass
-
index 566df46..2a4f19f 100644 (file)
@@ -1395,4 +1395,3 @@ class NetworkAdapterTest(Screen):
                        pass
                else:
                        iStatus.stopWlanConsole()
-
index 891379c..2b34bdb 100644 (file)
@@ -9,4 +9,3 @@ class PVRState(Screen):
 
 class TimeshiftState(PVRState):
        pass
-
index 5ea1fd3..c0964f5 100644 (file)
@@ -692,10 +692,10 @@ class SelectSatsEntryScreen(Screen):
                <screen name="SelectSatsEntryScreen" position="center,center" size="560,410" title="Select Sats Entry" >
                        <ePixmap name="red" position="0,0"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
                        <ePixmap name="green" position="140,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-                       <ePixmap name="yellow" position="280,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" /> 
-                       <ePixmap name="blue" position="420,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" /> 
-                       <widget name="key_red" position="0,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" /> 
-                       <widget name="key_green" position="140,0" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" /> 
+                       <ePixmap name="yellow" position="280,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
+                       <ePixmap name="blue" position="420,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
+                       <widget name="key_red" position="0,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
+                       <widget name="key_green" position="140,0" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
                        <widget name="key_yellow" position="280,0" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
                        <widget name="key_blue" position="420,0" size="140,40" valign="center" halign="center" zPosition="4" foregroundColor="white" font="Regular;17" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
                        <widget name="list" position="10,40" size="540,330" scrollbarMode="showNever" />
index 7f6bf31..b21cc68 100644 (file)
@@ -42,4 +42,4 @@ class ServiceStopScreen:
        def restartPrevService(self, yesno):
                if not yesno:
                        self.oldref=None
-               self.close()
\ No newline at end of file
+               self.close()
index 992e343..65557f0 100644 (file)
@@ -22,4 +22,3 @@ class SimpleSummary(Screen):
 
                # if parent has a "skin_summary" defined, use that as default
                self.skin = parent.__dict__.get("skin_summary", self.skin)
-
index bb9cfe7..e02b335 100644 (file)
@@ -7,7 +7,7 @@ from Components.Label import Label
 from Components.Sources.StaticText import StaticText
 from Components.config import config, getConfigListEntry
 from enigma import eEPGCache
-from time import time, localtime, mktime 
+from time import time, localtime, mktime
 
 class SleepTimerEdit(ConfigListScreen, Screen):
        def __init__(self, session):
index ff0301d..2f539e3 100644 (file)
@@ -132,7 +132,7 @@ class TimerEntry(Screen, ConfigListScreen):
                        self.timerentry_repeated = ConfigSelection(default = repeated, choices = [("weekly", _("weekly")), ("daily", _("daily")), ("weekdays", _("Mon-Fri")), ("user", _("user defined"))])
                        self.timerentry_renamerepeat = ConfigYesNo(default = rename_repeat)
 
-                       self.timerentry_conflictdetection = ConfigYesNo(default = conflict_detection) 
+                       self.timerentry_conflictdetection = ConfigYesNo(default = conflict_detection)
 
                        self.timerentry_date = ConfigDateTime(default = self.timer.begin, formatstring = _("%d.%B %Y"), increment = 86400)
                        self.timerentry_starttime = ConfigClock(default = self.timer.begin)
index 25913f2..20fb623 100644 (file)
@@ -15,4 +15,4 @@ def GetWithAlternative(service):
                channels = getAlternativeChannels(service)
                if channels:
                        return channels[0]
-       return service
\ No newline at end of file
+       return service
index 83de8e9..53acaf6 100644 (file)
@@ -5,4 +5,4 @@ def getTextBoundarySize(instance, font, targetSize, text):
        dummy.setFont(font)
        dummy.resize(targetSize)
        dummy.setText(text)
-       return dummy.calculateSize()
\ No newline at end of file
+       return dummy.calculateSize()
index c0f412e..2956881 100644 (file)
@@ -227,4 +227,4 @@ def ConvertToHumanReadable(tp, type = None):
        for k,v in tp.items():
                if k not in ret:
                        ret[k] = v
-       return ret
\ No newline at end of file
+       return ret
index 0a93bfc..a93b0c6 100644 (file)
@@ -29,4 +29,3 @@ for line, str in enumerate(source):
 del source
 del dest
 os.remove(filename + ".org")
-
index 1255d42..8d8aba7 100644 (file)
@@ -106,4 +106,4 @@ class genericdatasource(datasource):
                choice = inputChoices(list)
                if choice is None:
                        return None
-               return sources[choice]
\ No newline at end of file
+               return sources[choice]
index fd11348..e75ccdc 100644 (file)
@@ -20,4 +20,4 @@ def inputChoices(list, backcmd = "b", backtext = "back"):
                action = int(input)
                if action >= len(list):
                        repeat = True
-       return action
\ No newline at end of file
+       return action
index d6adc1f..9fb1779 100755 (executable)
@@ -18,4 +18,3 @@ gen.source = db
 gen.destination = xml
 gen.docopymerge(action = "copy")
 xml.write()
-
index d3cc985..9def3e1 100755 (executable)
@@ -40,4 +40,3 @@ while(True):
                #except:
                #       print sys.exc_info()
                #       print "sorry, could not execute that command"
-
index 9f79c57..04dc657 100644 (file)
@@ -81,6 +81,3 @@ class satxml(datasource):
                file = open(self.filename, "w")
                file.write(prettyxml)
                file.close()
-
-
-