Method run() moved from Port to Protocol

src/erlport/erlproto.py

@@ -39,14 +39,16 @@
 class Protocol(object):
     """Erlang port protocol."""
 
-    def connected(self, port):
-        """Port connected."""
-        self.port = port
-
-    def disconnected(self, reason):
-        """Port disconnected."""
+    def run(self, port):
+        """Run processing loop."""
+        while True:
+            try:
+                message = port.read()
+            except EOFError:
+                break
+            self.handle(port, message)
 
-    def handle(self, message):
+    def handle(self, port, message):
         """Handle incoming message."""
         if not (isinstance(message, Atom)
                 or isinstance(message, tuple) and len(message) > 0):
@@ -70,7 +72,7 @@ def handle(self, message):
                     except TypeError:
                         # Easy way to check correct number of arguments
                         response = Atom("error"), Atom("function_clause")
-        self.port.write(response)
+        port.write(response)
 
 
 class Port(object):
@@ -82,8 +84,6 @@ class Port(object):
         4: ">I",
         }
 
-    _running = False
-
     def __init__(self, packet=1, use_stdio=False, descriptors=None):
         self._format = self._formats.get(packet)
         if self._format is None:
@@ -97,26 +97,6 @@ def __init__(self, packet=1, use_stdio=False, descriptors=None):
         else:
             self.in_d, self.out_d = 3, 4
 
-    def run(self, proto):
-        """Run processing loop."""
-        if self._running:
-            raise RuntimeError("already running")
-        self._running = True
-        proto.connected(self)
-        try:
-            try:
-                while True:
-                    message = self.read()
-                    proto.handle(message)
-            except EOFError, why:
-                proto.disconnected(why)
-            except Exception, why:
-                proto.disconnected(why)
-                raise
-        finally:
-            self._running = False
-            self.close()
-
     def _read_data(self, length):
         data = ""
         while len(data) != length:

src/erlport/tests/erlproto.txt

@@ -18,12 +18,10 @@ Setup test modules, classes and functions:
     ...
     ...     port = Port(packet, descriptors=(r, w))
     ...     port2 = Port(packet, descriptors=(in_d, out_d))
-    ...     proto.connected(port)
     ...     port2.write((Atom("test"), u"value"))
     ...     message = port.read()
-    ...     proto.handle(message)
+    ...     proto.handle(port, message)
     ...     result = port2.read()
-    ...     proto.disconnected(EOFError())
     ...     return result
 
 Test protocol with different options: