Changeset 53eb75c

Timestamp:

2010-12-29T01:49:32Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

5eb78c0

Parents:

ae8cc50

Message:

Clean up some leftover debug messages

File:

• skype/skyped.py (modified) (6 diffs)

skype/skyped.py

@@ -43 +43 @@
         if type != KeyboardInterrupt:
                 print_exception(type, value, tb)
-        if options.conn: options.conn.close()
+        if options.conn:
+                options.conn.close()
         # shut down client if it's running
         try:
@@ -99 +100 @@
                 c = skype.skype.Command("PING", Block=True)
                 skype.skype.SendCommand(c)
-                dprint("... skype pinged")
         except Skype4Py.SkypeAPIError, s:
                 dprint("Warning, pinging Skype failed (%s)." % (s))
@@ -120 +120 @@
                                 time.sleep(1)
         if not done:
-                if options.conn: options.conn.close()
+                if options.conn:
+                        options.conn.close()
                 options.conn = False
         return done
@@ -131 +132 @@
                         e = "PING"
                         done = send(options.conn, "%s\n" % e)
-                        dprint("... pinged Bitlbee")
                 except Exception, s:
                         dprint("Warning, sending '%s' failed (%s)." % (e, s))
@@ -243 +243 @@
                                         options.conn = False
                         else:
-                                dprint('---' + e)
+                                dprint('-- ' + e)
 
         def send(self, msg_text):
                 if not len(msg_text) or msg_text == "PONG":
-                        if msg_text == "PONG": options.last_bitlbee_pong = time.time()
+                        if msg_text == "PONG":
+                                options.last_bitlbee_pong = time.time()
                         return
                 try:
@@ -338 +339 @@
                                         # TODO is following line necessary? Should there be a options.conn.unwrap() somewhere?
                                         # options.conn.shutdown()
-                                        if options.conn: options.conn.close()
+                                        if options.conn:
+                                                options.conn.close()
                                         options.conn = False
-                                else:
-                                        dprint("%f seconds since last PONG" % (now - options.last_bitlbee_pong))
                         else:
                                 options.last_bitlbee_pong = now
-        dprint("Serverloop done")
 
 if __name__=='__main__':