Reindent to 4 spaces.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@894 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/connector.py

@@ -25,137 +25,141 @@ import logging
 connector_registry = {}
 
 def registerConnectorHandler(connector_handler):
-  connector_registry[connector_handler.__name__] = connector_handler
+    connector_registry[connector_handler.__name__] = connector_handler
 
 def getConnectorHandler(connector):
-  if isinstance(connector, basestring):
-    connector_handler = connector_registry.get(connector)
-  else:
-    # Allow to directly provide a handler class without requiring to register
-    # it first.
-    connector_handler = connector
-  return connector_handler
+    if isinstance(connector, basestring):
+        connector_handler = connector_registry.get(connector)
+    else:
+        # Allow to directly provide a handler class without requiring to
+        # register it first.
+        connector_handler = connector
+    return connector_handler
 
 class SocketConnector:
-  """ This class is a wrapper for a socket """
-
-  is_listening = False
-  remote_addr = None
-  is_closed = None
-
-  def __init__(self, s=None, accepted_from=None):
-    self.accepted_from = accepted_from
-    if accepted_from is not None:
-      self.remote_addr = accepted_from
-      self.is_listening = False
-      self.is_closed = False
-    if s is None:      
-      self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-    else:
-      self.socket = s
-  
-  def makeClientConnection(self, addr):
-    self.is_closed = False
-    self.remote_addr = addr
-    try:
-      try:
-        self.socket.setblocking(0)
-        self.socket.connect(addr)
-      except socket.error, (err, errmsg):
-        if err == errno.EINPROGRESS:
-          raise ConnectorInProgressException
-        if err == errno.ECONNREFUSED:
-          raise ConnectorConnectionRefusedException
-        raise ConnectorException, 'makeClientConnection failed: %s:%s' %  (err, errmsg)
-    finally:
-      logging.debug('%r connecting to %r', self.socket.getsockname(), addr)
-
-  def makeListeningConnection(self, addr):
-    self.is_closed = False
-    self.is_listening = True
-    try:
-      self.socket.setblocking(0)
-      self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-      self.socket.bind(addr)
-      self.socket.listen(5)
-    except socket.error, (err, errmsg):
-      self.socket.close()
-      raise ConnectorException, 'makeListeningConnection failed: %s:%s' % (err, errmsg)
-
-  def getError(self):
-    return self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
-
-  def getDescriptor(self):
-    # this descriptor must only be used by the event manager, where it guarantee
-    # unicity only while the connector is opened and registered in epoll
-    return self.socket.fileno()
-
-  def getNewConnection(self):
-    try:
-      new_s, addr =  self.socket.accept()
-      new_s = SocketConnector(new_s, accepted_from=addr)
-      return new_s, addr
-    except socket.error, (err, errmsg):
-      if err == errno.EAGAIN:
-        raise ConnectorTryAgainException
-      raise ConnectorException, 'getNewConnection failed: %s:%s' % (err, errmsg)
-
-  def shutdown(self):
-    # This may fail if the socket is not connected.
-    try:
-      self.socket.shutdown(socket.SHUT_RDWR)
-    except socket.error:
-      pass
-
-  def receive(self):
-    try:
-      return self.socket.recv(4096)
-    except socket.error, (err, errmsg):
-      if err == errno.EAGAIN:
-        raise ConnectorTryAgainException
-      if err == errno.ECONNREFUSED:
-        raise ConnectorConnectionRefusedException
-      if err == errno.ECONNRESET:
-          raise ConnectorConnectionClosedException
-      raise ConnectorException, 'receive failed: %s:%s' % (err, errmsg)
-
-  def send(self, msg):
-    try:
-      return self.socket.send(msg)
-    except socket.error, (err, errmsg):
-      if err == errno.EAGAIN:
-        raise ConnectorTryAgainException
-      if err == errno.ECONNRESET:
-          raise ConnectorConnectionClosedException
-      raise ConnectorException, 'send failed: %s:%s' % (err, errmsg) 
-
-  def close(self):
-    self.is_closed = True
-    return self.socket.close()
-
-  def __repr__(self):
-    try:
-      fileno = str(self.socket.fileno())
-    except socket.error, (err, errmsg):
-      fileno = '?'
-    result = '<%s at 0x%x fileno %s %s>' % (self.__class__.__name__, id(self),
-      fileno, self.socket.getsockname())
-    if self.is_closed is None:
-      result += 'never opened'
-    else:
-      if self.is_closed:
-        result += 'closed '
-      else:
-        result += 'opened '
-      if self.is_listening:
-        result += 'listening'
-      else:
-        if self.accepted_from is None:
-          result += 'to'
+    """ This class is a wrapper for a socket """
+
+    is_listening = False
+    remote_addr = None
+    is_closed = None
+
+    def __init__(self, s=None, accepted_from=None):
+        self.accepted_from = accepted_from
+        if accepted_from is not None:
+            self.remote_addr = accepted_from
+            self.is_listening = False
+            self.is_closed = False
+        if s is None:      
+            self.socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        else:
+            self.socket = s
+    
+    def makeClientConnection(self, addr):
+        self.is_closed = False
+        self.remote_addr = addr
+        try:
+            try:
+                self.socket.setblocking(0)
+                self.socket.connect(addr)
+            except socket.error, (err, errmsg):
+                if err == errno.EINPROGRESS:
+                    raise ConnectorInProgressException
+                if err == errno.ECONNREFUSED:
+                    raise ConnectorConnectionRefusedException
+                raise ConnectorException, 'makeClientConnection failed: ' \
+                    '%s:%s' % (err, errmsg)
+        finally:
+            logging.debug('%r connecting to %r', self.socket.getsockname(),
+                          addr)
+
+    def makeListeningConnection(self, addr):
+        self.is_closed = False
+        self.is_listening = True
+        try:
+            self.socket.setblocking(0)
+            self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+            self.socket.bind(addr)
+            self.socket.listen(5)
+        except socket.error, (err, errmsg):
+            self.socket.close()
+            raise ConnectorException, 'makeListeningConnection failed: %s:%s' % \
+                (err, errmsg)
+
+    def getError(self):
+        return self.socket.getsockopt(socket.SOL_SOCKET, socket.SO_ERROR)
+
+    def getDescriptor(self):
+        # this descriptor must only be used by the event manager, where it guarantee
+        # unicity only while the connector is opened and registered in epoll
+        return self.socket.fileno()
+
+    def getNewConnection(self):
+        try:
+            new_s, addr =  self.socket.accept()
+            new_s = SocketConnector(new_s, accepted_from=addr)
+            return new_s, addr
+        except socket.error, (err, errmsg):
+            if err == errno.EAGAIN:
+                raise ConnectorTryAgainException
+            raise ConnectorException, 'getNewConnection failed: %s:%s' % \
+                (err, errmsg)
+
+    def shutdown(self):
+        # This may fail if the socket is not connected.
+        try:
+            self.socket.shutdown(socket.SHUT_RDWR)
+        except socket.error:
+            pass
+
+    def receive(self):
+        try:
+            return self.socket.recv(4096)
+        except socket.error, (err, errmsg):
+            if err == errno.EAGAIN:
+                raise ConnectorTryAgainException
+            if err == errno.ECONNREFUSED:
+                raise ConnectorConnectionRefusedException
+            if err == errno.ECONNRESET:
+                raise ConnectorConnectionClosedException
+            raise ConnectorException, 'receive failed: %s:%s' % (err, errmsg)
+
+    def send(self, msg):
+        try:
+            return self.socket.send(msg)
+        except socket.error, (err, errmsg):
+            if err == errno.EAGAIN:
+                raise ConnectorTryAgainException
+            if err == errno.ECONNRESET:
+                raise ConnectorConnectionClosedException
+            raise ConnectorException, 'send failed: %s:%s' % (err, errmsg) 
+
+    def close(self):
+        self.is_closed = True
+        return self.socket.close()
+
+    def __repr__(self):
+        try:
+            fileno = str(self.socket.fileno())
+        except socket.error, (err, errmsg):
+            fileno = '?'
+        result = '<%s at 0x%x fileno %s %s>' % (self.__class__.__name__,
+                 id(self), fileno, self.socket.getsockname())
+        if self.is_closed is None:
+            result += 'never opened'
         else:
-          result += 'from'
-        result += ' %s' % (self.remote_addr, )
-    return result + '>'
+            if self.is_closed:
+                result += 'closed '
+            else:
+                result += 'opened '
+            if self.is_listening:
+                result += 'listening'
+            else:
+                if self.accepted_from is None:
+                    result += 'to'
+                else:
+                    result += 'from'
+                result += ' %s' % (self.remote_addr, )
+        return result + '>'
 
 registerConnectorHandler(SocketConnector)