Changes in protocols/skype/skyped.py [9ec6b36:1a0b734]

File:

• protocols/skype/skyped.py (modified) (7 diffs)

protocols/skype/skyped.py

@@ -3 +3 @@
 #   skyped.py
 #  
-#   Copyright (c) 2007-2013 by Miklos Vajna <vmiklos@vmiklos.hu>
+#   Copyright (c) 2007, 2008, 2009, 2010, 2011 by Miklos Vajna <vmiklos@frugalware.org>
 #
 #   This program is free software; you can redistribute it and/or modify
@@ -276 +276 @@
                 sock.close()
 
-class MockedSkype:
-        """Mock class for Skype4Py.Skype(), in case the -m option is used."""
-        def __init__(self, mock):
-                sock = open(mock)
-                self.lines = sock.readlines()
-        
-        def SendCommand(self, c):
-                pass
-
-        def Command(self, msg, Block):
-                if msg == "PING":
-                        return ["PONG"]
-                line = self.lines[0].strip()
-                if not line.startswith(">> "):
-                        raise Exception("Corrupted mock input")
-                line = line[3:]
-                if line != msg:
-                        raise Exception("'%s' != '%s'" % (line, msg))
-                self.lines = self.lines[1:] # drop the expected incoming line
-                ret = []
-                while True:
-                        # and now send back all the following lines, up to the next expected incoming line
-                        if len(self.lines) == 0:
-                                break
-                        if self.lines[0].startswith(">> "):
-                                break
-                        if not self.lines[0].startswith("<< "):
-                                raise Exception("Corrupted mock input")
-                        ret.append(self.lines[0][3:].strip())
-                        self.lines = self.lines[1:]
-                return ret
-
 class SkypeApi:
-        def __init__(self, mock):
-                if not mock:
-                        self.skype = Skype4Py.Skype()
-                        self.skype.OnNotify = self.recv
-                        self.skype.Client.Start()
-                else:
-                        self.skype = MockedSkype(mock)
+        def __init__(self):
+                self.skype = Skype4Py.Skype()
+                self.skype.OnNotify = self.recv
+                self.skype.Client.Start()
 
         def recv(self, msg_text):
@@ -370 +335 @@
                         c = self.skype.Command(e, Block=True)
                         self.skype.SendCommand(c)
-                        if hasattr(c, "Reply"):
-                                self.recv(c.Reply) # Skype4Py answer
-                        else:
-                                for i in c: # mock may return multiple iterable answers
-                                        self.recv(i)
+                        self.recv(c.Reply)
                 except Skype4Py.SkypeError:
                         pass
@@ -399 +360 @@
                 # this will be read first by the input handler
                 self.buf = None
-                self.mock = None
 
 
@@ -462 +422 @@
         options = Options()
         try:
-                opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:m:np:v", ["config=", "debug", "help", "host=", "log=", "mock=", "nofork", "port=", "version"])
+                opts, args = getopt.getopt(sys.argv[1:], "c:dhH:l:np:v", ["config=", "debug", "help", "host=", "log=", "nofork", "port=", "version"])
         except getopt.GetoptError:
                 options.usage(1)
@@ -476 +436 @@
                 elif opt in ("-l", "--log"):
                         options.log = arg
-                elif opt in ("-m", "--mock"):
-                        options.mock = arg
                 elif opt in ("-n", "--nofork"):
                         options.daemon = False
@@ -528 +486 @@
                 server(options.host, options.port)
         try:
-                skype = SkypeApi(options.mock)
+                skype = SkypeApi()
         except Skype4Py.SkypeAPIError, s:
                 sys.exit("%s. Are you sure you have started Skype?" % s)