diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-02-14 16:18:44 -0500 |
| commit | a278f79bdbdb842193092a9e0176ecb8b1867762 (patch) | |
| tree | c55be3e45f61133c01969be201d3a6476dbe5762 /sleekxmpp/xmlstream/scheduler.py | |
| parent | 606c369173e7a31d793540d90e425a78c2a81253 (diff) | |
| parent | d709f8db657aa1d1314082d842dd29e2546739c4 (diff) | |
| download | slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.gz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.bz2 slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.tar.xz slixmpp-a278f79bdbdb842193092a9e0176ecb8b1867762.zip | |
Merge branch 'develop' into roster
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/xmlstream/scheduler.py')
| -rw-r--r-- | sleekxmpp/xmlstream/scheduler.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sleekxmpp/xmlstream/scheduler.py b/sleekxmpp/xmlstream/scheduler.py index 14359102..0e711b4b 100644 --- a/sleekxmpp/xmlstream/scheduler.py +++ b/sleekxmpp/xmlstream/scheduler.py @@ -140,7 +140,8 @@ class Scheduler(object): """Process scheduled tasks.""" self.run = True try: - while self.run and (self.parentstop is None or not self.parentstop.isSet()): + while self.run and (self.parentstop is None or \ + not self.parentstop.isSet()): wait = 1 updated = False if self.schedule: |