Drop Python 2.5 support

This commit is contained in:
Guillaume Ayoub 2011-05-11 06:21:35 +02:00
parent aacfa8ff46
commit ce362e1b50
3 changed files with 2 additions and 6 deletions

1
NEWS
View File

@ -16,6 +16,7 @@
* LDAP auth backend (by Corentin Le Bail) * LDAP auth backend (by Corentin Le Bail)
* Owner-less calendars (by René Neumann) * Owner-less calendars (by René Neumann)
* Journal entries support * Journal entries support
* Drop Python 2.5 support
0.5 - Historical Artifacts 0.5 - Historical Artifacts

View File

@ -32,6 +32,7 @@ import os
import posixpath import posixpath
import base64 import base64
import socket import socket
import ssl
import wsgiref.simple_server import wsgiref.simple_server
# Manage Python2/3 different modules # Manage Python2/3 different modules
# pylint: disable=F0401 # pylint: disable=F0401
@ -73,11 +74,6 @@ class HTTPSServer(HTTPServer):
"""HTTPS server.""" """HTTPS server."""
def __init__(self, address, handler): def __init__(self, address, handler):
"""Create server by wrapping HTTP socket in an SSL socket.""" """Create server by wrapping HTTP socket in an SSL socket."""
# Fails with Python 2.5, import if needed
# pylint: disable=F0401
import ssl
# pylint: enable=F0401
super(HTTPSServer, self).__init__(address, handler, False) super(HTTPSServer, self).__init__(address, handler, False)
self.socket = ssl.wrap_socket( self.socket = ssl.wrap_socket(

View File

@ -85,7 +85,6 @@ setup(
"License :: OSI Approved :: GNU General Public License (GPL)", "License :: OSI Approved :: GNU General Public License (GPL)",
"Operating System :: OS Independent", "Operating System :: OS Independent",
"Programming Language :: Python :: 2", "Programming Language :: Python :: 2",
"Programming Language :: Python :: 2.5",
"Programming Language :: Python :: 2.6", "Programming Language :: Python :: 2.6",
"Programming Language :: Python :: 2.7", "Programming Language :: Python :: 2.7",
"Programming Language :: Python :: 3", "Programming Language :: Python :: 3",