git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
remove deprecated code (deprecation date was 2008-01 and 2008-02)
[enigma2.git]
/
lib
/
python
/
Screens
/
Screen.py
diff --git
a/lib/python/Screens/Screen.py
b/lib/python/Screens/Screen.py
index 585f15cf02e8f473484254724b4602209e4ad68a..508309dbfa98a0a6966616083fd93140f1b2b453 100644
(file)
--- a/
lib/python/Screens/Screen.py
+++ b/
lib/python/Screens/Screen.py
@@
-1,9
+1,13
@@
-from Components.HTMLSkin import HTMLSkin
+from Tools.Profile import profile, profile_final
+
+profile("LOAD:GUISkin")
from Components.GUISkin import GUISkin
from Components.GUISkin import GUISkin
+profile("LOAD:Source")
from Components.Sources.Source import Source
from Components.Sources.Source import Source
+profile("LOAD:GUIComponent")
from Components.GUIComponent import GUIComponent
from Components.GUIComponent import GUIComponent
-class Screen(dict,
HTMLSkin,
GUISkin):
+class Screen(dict, GUISkin):
ALLOW_SUSPEND = False
ALLOW_SUSPEND = False
@@
-94,18
+98,15
@@
class Screen(dict, HTMLSkin, GUISkin):
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
# but currently we destroy the screen afterwards
# anyway.
for val in self.renderer:
- val.disconnectAll() # disconnected converter/sources and probably destroy them
-
+ val.disconnectAll() # disconnected converter/sources and probably destroy them
. Sources will not be destroyed.
+
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
del self.session
for (name, val) in self.items():
val.destroy()
del self[name]
-
- for val in self.renderer:
- val.destroy()
-
+
self.renderer = [ ]
self.renderer = [ ]
-
+
# really delete all elements now
self.__dict__.clear()
# really delete all elements now
self.__dict__.clear()