open method changed to use arguments and set instance host/port values (instead of __init__)
This commit is contained in:
parent
48165d40cb
commit
f97b2d7dad
|
@ -133,8 +133,6 @@ class IMAP4:
|
||||||
mustquote = re.compile(r"[^\w!#$%&'*+,.:;<=>?^`|~-]")
|
mustquote = re.compile(r"[^\w!#$%&'*+,.:;<=>?^`|~-]")
|
||||||
|
|
||||||
def __init__(self, host = '', port = IMAP4_PORT):
|
def __init__(self, host = '', port = IMAP4_PORT):
|
||||||
self.host = host
|
|
||||||
self.port = port
|
|
||||||
self.debug = Debug
|
self.debug = Debug
|
||||||
self.state = 'LOGOUT'
|
self.state = 'LOGOUT'
|
||||||
self.literal = None # A literal argument to a command
|
self.literal = None # A literal argument to a command
|
||||||
|
@ -205,13 +203,16 @@ class IMAP4:
|
||||||
# Overridable methods
|
# Overridable methods
|
||||||
|
|
||||||
|
|
||||||
def open(self, host, port):
|
def open(self, host = '', port = IMAP4_PORT):
|
||||||
"""Setup connection to remote server on "host:port".
|
"""Setup connection to remote server on "host:port"
|
||||||
|
(default: localhost:standard IMAP4 port).
|
||||||
This connection will be used by the routines:
|
This connection will be used by the routines:
|
||||||
read, readline, send, shutdown.
|
read, readline, send, shutdown.
|
||||||
"""
|
"""
|
||||||
|
self.host = host
|
||||||
|
self.port = port
|
||||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
self.sock.connect((self.host, self.port))
|
self.sock.connect((host, port))
|
||||||
self.file = self.sock.makefile('rb')
|
self.file = self.sock.makefile('rb')
|
||||||
|
|
||||||
|
|
||||||
|
@ -1005,13 +1006,16 @@ class IMAP4_SSL(IMAP4):
|
||||||
IMAP4.__init__(self, host, port)
|
IMAP4.__init__(self, host, port)
|
||||||
|
|
||||||
|
|
||||||
def open(self, host, port):
|
def open(self, host = '', port = IMAP4_SSL_PORT):
|
||||||
"""Setup connection to remote server on "host:port".
|
"""Setup connection to remote server on "host:port".
|
||||||
|
(default: localhost:standard IMAP4 SSL port).
|
||||||
This connection will be used by the routines:
|
This connection will be used by the routines:
|
||||||
read, readline, send, shutdown.
|
read, readline, send, shutdown.
|
||||||
"""
|
"""
|
||||||
|
self.host = host
|
||||||
|
self.port = port
|
||||||
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
||||||
self.sock.connect((self.host, self.port))
|
self.sock.connect((host, port))
|
||||||
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
|
self.sslobj = socket.ssl(self.sock, self.keyfile, self.certfile)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue