git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Patch by nix-nix: Factor out getPixmapForEntry for easier override with custom pixmaps
[enigma2.git]
/
e2reactor.py
diff --git
a/e2reactor.py
b/e2reactor.py
index 4f069f91622c52717e281f37a1684aa1087f0618..cca2f358eeb5632b98f9c11deb4d0802a69481be 100644
(file)
--- a/
e2reactor.py
+++ b/
e2reactor.py
@@
-11,7
+11,7
@@
Maintainer: U{Felix Domke<mailto:tmbinc@elitedvb.net>}
import select, errno, sys
# Twisted imports
import select, errno, sys
# Twisted imports
-from twisted.python import log,
threadable,
failure
+from twisted.python import log, failure
from twisted.internet import main, posixbase, error
#from twisted.internet.pollreactor import PollReactor, poller
from twisted.internet import main, posixbase, error
#from twisted.internet.pollreactor import PollReactor, poller
@@
-36,7
+36,10
@@
class E2SharedPoll:
del self.dict[fd]
def poll(self, timeout = None):
del self.dict[fd]
def poll(self, timeout = None):
- r = self.eApp.poll(timeout, self.dict)
+ try:
+ r = self.eApp.poll(timeout, self.dict)
+ except KeyboardInterrupt:
+ return None
return r
poller = E2SharedPoll()
return r
poller = E2SharedPoll()