Changeset 5ffa4f7

Timestamp:

2012-07-20T22:18:08Z (12 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

809cd37

Parents:

7d2ce9a (diff), 1a0b734 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from vmiklos, should fox #979.

File:

• protocols/skype/skyped.py (modified) (1 diff)

protocols/skype/skyped.py

@@ -120 +120 @@
                 c = skype.skype.Command("PING", Block=True)
                 skype.skype.SendCommand(c)
-        except Skype4Py.SkypeAPIError, s:
+        except (Skype4Py.SkypeAPIError, AttributeError), s:
                 dprint("Warning, pinging Skype failed (%s)." % (s))
+                time.sleep(1)
         return True