From ce362e1b5053f38a89345903703694a25c844f5f Mon Sep 17 00:00:00 2001
From: Guillaume Ayoub <guillaume.ayoub@kozea.fr>
Date: Wed, 11 May 2011 06:21:35 +0200
Subject: [PATCH] Drop Python 2.5 support

---
 NEWS                 | 1 +
 radicale/__init__.py | 6 +-----
 setup.py             | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index c204c0f..7783c86 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@
 * LDAP auth backend (by Corentin Le Bail)
 * Owner-less calendars (by René Neumann)
 * Journal entries support
+* Drop Python 2.5 support
 
 
 0.5 - Historical Artifacts
diff --git a/radicale/__init__.py b/radicale/__init__.py
index fcf6265..0358535 100644
--- a/radicale/__init__.py
+++ b/radicale/__init__.py
@@ -32,6 +32,7 @@ import os
 import posixpath
 import base64
 import socket
+import ssl
 import wsgiref.simple_server
 # Manage Python2/3 different modules
 # pylint: disable=F0401
@@ -73,11 +74,6 @@ class HTTPSServer(HTTPServer):
     """HTTPS server."""
     def __init__(self, address, handler):
         """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)
 
         self.socket = ssl.wrap_socket(
diff --git a/setup.py b/setup.py
index fe74516..a95caa9 100755
--- a/setup.py
+++ b/setup.py
@@ -85,7 +85,6 @@ setup(
         "License :: OSI Approved :: GNU General Public License (GPL)",
         "Operating System :: OS Independent",
         "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.5",
         "Programming Language :: Python :: 2.6",
         "Programming Language :: Python :: 2.7",
         "Programming Language :: Python :: 3",