diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:34 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2010-11-03 17:40:34 +0100 |
| commit | 1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7 (patch) | |
| tree | d4cd5829424178dd41e730c4401a50daa80e02ed /lib/python/Screens | |
| parent | 3c14624fb6631feb91ac28c102027fb9bbc79b7a (diff) | |
| download | enigma2-1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7.tar.gz enigma2-1a7cc7d5f04ae8bcf6ae879f1cfc11c9072a95d7.zip | |
fix more (no more allowed) global imports of parentalControl instance
refs bug #607
Diffstat (limited to 'lib/python/Screens')
| -rw-r--r-- | lib/python/Screens/ParentalControlSetup.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/python/Screens/ParentalControlSetup.py b/lib/python/Screens/ParentalControlSetup.py index f174b583..284294fc 100644 --- a/lib/python/Screens/ParentalControlSetup.py +++ b/lib/python/Screens/ParentalControlSetup.py @@ -3,7 +3,7 @@ from Components.ConfigList import ConfigListScreen from Components.ActionMap import NumberActionMap from Components.config import config, getConfigListEntry, ConfigNothing, NoSave, ConfigPIN from Components.ParentalControlList import ParentalControlEntryComponent, ParentalControlList -from Components.ParentalControl import parentalControl + from Components.Sources.StaticText import StaticText from Screens.ChoiceBox import ChoiceBox from Screens.MessageBox import MessageBox @@ -119,6 +119,7 @@ class ParentalControlSetup(Screen, ConfigListScreen, ProtectedScreen): elif self["config"].l.getCurrentSelection() == self.changeSetupPin: self.session.open(ParentalControlChangePin, config.ParentalControl.setuppin, _("setup PIN")) elif self["config"].l.getCurrentSelection() == self.reloadLists: + from Components.ParentalControl import parentalControl parentalControl.open() else: ConfigListScreen.keyRight(self) @@ -255,6 +256,7 @@ class ParentalControlEditor(Screen): self.session.openWithCallback(self.letterChosen, ChoiceBox, title=_("Show services beginning with"), list=mylist, keys = [], selection = sel) def letterChosen(self, result): + from Components.ParentalControl import parentalControl if result is not None: print "result:", result self.currentLetter = result[1] @@ -284,6 +286,7 @@ class ParentalControlBouquetEditor(Screen): }, -1) def cancel(self): + from Components.ParentalControl import parentalControl parentalControl.save() self.close() @@ -300,6 +303,7 @@ class ParentalControlBouquetEditor(Screen): self.bouquetlist = list.getContent("CN", True) def selectBouquet(self): + from Components.ParentalControl import parentalControl self.list = [ParentalControlEntryComponent(x[0], x[1], parentalControl.getProtectionType(x[0])) for x in self.bouquetlist] self.bouquetslist.setList(self.list) |