Changeset 8e166ae

Timestamp:

2013-02-11T12:56:04Z (12 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

5a4f22e

Parents:

5a0ffa2

git-author:

Mike Kazantsev <mk.fraggod@…> (11-02-13 12:56:04)

git-committer:

Miklos Vajna <vmiklos@…> (11-02-13 12:56:04)

Message:

skype: cleanup of the send() code

Use socket.sendall(), as send() is not guaranteed to send all
the data passed (though it should generally work that way with
blocking sockets).
Use more robust, obvious and idiomatic loop conditions.
Cleanup redundant imports and variables.

File:

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

protocols/skype/skyped.py

@@ -124 +124 @@
         return True
 
-def send(sock, txt):
-        global options
-        from time import sleep
-        count = 1
-        done = False
+def send(sock, txt, tries=10):
+        global options
         if hasgobject:
-                while (not done) and (count < 10):
+                for attempt in xrange(1, tries+1):
                         try:
-                                sock.send(txt)
-                                done = True
+                                sock.sendall(txt)
                         except Exception, s:
-                                count += 1
-                                dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
-                                sleep(1)
-                if not done:
+                                dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, attempt))
+                                time.sleep(1)
+                        else:
+                                break
+                else:
                         options.conn.close()
         else:
-                while (not done) and (count < 10) and options.conn:
+                for attempt in xrange(1, tries+1):
+                        if not options.conn: break
                         if wait_for_lock(options.lock, 3, 10, "socket send"):
                                 try:
-                                         if options.conn: sock.send(txt)
+                                         if options.conn: sock.sendall(txt)
                                          options.lock.release()
-                                         done = True
                                 except Exception, s:
                                         options.lock.release()
-                                        count += 1
                                         dprint("Warning, sending '%s' failed (%s). count=%d" % (txt, s, count))
-                                        sleep(1)
-                if not done:
+                                        time.sleep(1)
+                                else:
+                                        break
+                else:
                         if options.conn:
                                 options.conn.close()