summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEevee <eevee.github@veekun.com>2014-07-09 21:46:13 -0700
committerEevee <eevee.github@veekun.com>2014-07-09 21:46:13 -0700
commit279879c1c943e8178be6871c692ee5d2e8388ede (patch)
tree51e129ab191f9e3e6000b95be9400189324e3968
parentbccb52c5071d2efc4f9445d6e3085d6cb5ef1efd (diff)
parent6e964f59c7c676c896f8892c304080e59900051e (diff)
downloadurwid-279879c1c943e8178be6871c692ee5d2e8388ede.tar.gz
Merge pull request #1 from horazont/loop-cleanup-fixes
Adapt docstrings to changed arguments
-rwxr-xr-xurwid/main_loop.py5
-rw-r--r--urwid/util.py4
2 files changed, 6 insertions, 3 deletions
diff --git a/urwid/main_loop.py b/urwid/main_loop.py
index e45208f..77022bf 100755
--- a/urwid/main_loop.py
+++ b/urwid/main_loop.py
@@ -367,7 +367,10 @@ class MainLoop(object):
try:
self.start()
except CantUseExternalLoop:
- return self._run_screen_event_loop()
+ try:
+ return self._run_screen_event_loop()
+ finally:
+ self.screen.stop()
self.event_loop.run()
self.stop()
diff --git a/urwid/util.py b/urwid/util.py
index 61e5eb6..3569f8c 100644
--- a/urwid/util.py
+++ b/urwid/util.py
@@ -283,7 +283,7 @@ def rle_len( rle ):
def rle_append_beginning_modify(rle, a_r):
"""
- Append (a, r) to BEGINNING of rle.
+ Append (a, r) (unpacked from *a_r*) to BEGINNING of rle.
Merge with first run when possible
MODIFIES rle parameter contents. Returns None.
@@ -301,7 +301,7 @@ def rle_append_beginning_modify(rle, a_r):
def rle_append_modify(rle, a_r):
"""
- Append (a,r) to the rle list rle.
+ Append (a, r) (unpacked from *a_r*) to the rle list rle.
Merge with last run when possible.
MODIFIES rle parameter contents. Returns None.