Commit b4c2b308 authored by Grégory Wisniewski's avatar Grégory Wisniewski

Remove trailing whitspaces.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2656 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent 408b2448
...@@ -393,46 +393,46 @@ class PEnum(PStructItem): ...@@ -393,46 +393,46 @@ class PEnum(PStructItem):
raise ValueError, 'Invalid code for %s enum: %r' % (enum, code) raise ValueError, 'Invalid code for %s enum: %r' % (enum, code)
class PAddressIPGeneric(PStructItem): class PAddressIPGeneric(PStructItem):
def __init__(self, name, format): def __init__(self, name, format):
PStructItem.__init__(self, name, format) PStructItem.__init__(self, name, format)
def encode(self, writer, address): def encode(self, writer, address):
host, port = address host, port = address
host = socket.inet_pton(self.af_type, host) host = socket.inet_pton(self.af_type, host)
writer(self.pack(host, port)) writer(self.pack(host, port))
def decode(self, reader): def decode(self, reader):
data = reader(self.size) data = reader(self.size)
address = self.unpack(data) address = self.unpack(data)
host, port = address host, port = address
host = socket.inet_ntop(self.af_type, host) host = socket.inet_ntop(self.af_type, host)
return (host, port) return (host, port)
class PAddressIPv4(PAddressIPGeneric): class PAddressIPv4(PAddressIPGeneric):
af_type = socket.AF_INET af_type = socket.AF_INET
def __init__(self, name): def __init__(self, name):
PAddressIPGeneric.__init__(self, name, '!4sH') PAddressIPGeneric.__init__(self, name, '!4sH')
class PAddressIPv6(PAddressIPGeneric): class PAddressIPv6(PAddressIPGeneric):
af_type = socket.AF_INET6 af_type = socket.AF_INET6
def __init__(self, name): def __init__(self, name):
PAddressIPGeneric.__init__(self, name, '!16sH') PAddressIPGeneric.__init__(self, name, '!16sH')
class PAddress(PStructItem): class PAddress(PStructItem):
""" """
An host address (IPv4/IPv6) An host address (IPv4/IPv6)
""" """
address_format_dict = { address_format_dict = {
socket.AF_INET: PAddressIPv4('ipv4'), socket.AF_INET: PAddressIPv4('ipv4'),
socket.AF_INET6: PAddressIPv6('ipv6'), socket.AF_INET6: PAddressIPv6('ipv6'),
} }
def __init__(self, name): def __init__(self, name):
PStructItem.__init__(self, name, '!L') PStructItem.__init__(self, name, '!L')
def _encode(self, writer, address): def _encode(self, writer, address):
if address is None: if address is None:
...@@ -441,7 +441,7 @@ class PAddress(PStructItem): ...@@ -441,7 +441,7 @@ class PAddress(PStructItem):
writer(self.pack(af_type)) writer(self.pack(af_type))
encoder = self.address_format_dict[af_type] encoder = self.address_format_dict[af_type]
encoder.encode(writer, address) encoder.encode(writer, address)
def _decode(self, reader): def _decode(self, reader):
af_type = self.unpack(reader(self.size))[0] af_type = self.unpack(reader(self.size))[0]
decoder = self.address_format_dict[af_type] decoder = self.address_format_dict[af_type]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment