Guillaume Ayoub 14 лет назад
Родитель
Сommit
ce362e1b50
3 измененных файлов с 2 добавлено и 6 удалено
  1. 1 0
      NEWS
  2. 1 5
      radicale/__init__.py
  3. 0 1
      setup.py

+ 1 - 0
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

+ 1 - 5
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(

+ 0 - 1
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",