Remove python<2.6 import workarounds (set & ssl)

'set' is builtin since python2.6, so remove the imports. Also 'ssl' exists
since 2.6 and has everything we need, so no need for conditional import
tests here anymore.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
This commit is contained in:
Sebastian Spaeth
2012-02-05 12:17:02 +01:00
parent 93f4a19778
commit 81fc20c7ca
7 changed files with 6 additions and 31 deletions

View File

@ -27,11 +27,7 @@ import time
import errno
from sys import exc_info
from socket import gaierror
try:
from ssl import SSLError, cert_time_to_seconds
except ImportError:
# Protect against python<2.6, use dummy and won't get SSL errors.
SSLError = None
from ssl import SSLError, cert_time_to_seconds
try:
# do we have a recent pykerberos?
@ -323,7 +319,7 @@ class IMAPServer:
(self.hostname, self.repos)
raise OfflineImapError(reason, severity)
elif SSLError and isinstance(e, SSLError) and e.errno == 1:
elif isinstance(e, SSLError) and e.errno == 1:
# SSL unknown protocol error
# happens e.g. when connecting via SSL to a non-SSL service
if self.port != 993: