python-2.7 is now for granted

diff --git a/PLC/Filter.py b/PLC/Filter.py
index fe00c2b..c7e28e3 100644 (file)
--- a/PLC/Filter.py
+++ b/PLC/Filter.py
@@ -2,12 +2,6 @@
 # Thierry Parmentelat - INRIA
 #
 from types import StringTypes
-try:
-    set
-except NameError:
-    from sets import Set
-    set = Set
-
 import time
 
 from PLC.Faults import *

diff --git a/plcapi.spec b/plcapi.spec
index 714943e..f1a4ff6 100644 (file)
--- a/plcapi.spec
+++ b/plcapi.spec
@@ -26,7 +26,7 @@ Requires: httpd mod_ssl
 Requires: Django
 Requires: postgresql >= 8.2, postgresql-server >= 8.2
 # We use set everywhere
-Requires: python >= 2.4
+Requires: python >= 2.7
 Requires: postgresql-python
 Requires: python-psycopg2
 Requires: python-pycurl

diff --git a/wsdl/api2wsdl.py b/wsdl/api2wsdl.py
index 00f16cd..296048e 100755 (executable)
--- a/wsdl/api2wsdl.py
+++ b/wsdl/api2wsdl.py
@@ -23,12 +23,6 @@ from PLC.Parameter import Parameter, Mixed, python_type, xmlrpc_type
 
 api = PLCAPI(None)
 
-try:
-    set
-except NameError:
-    from sets import Set
-    set = Set
-
 # Class functions
 
 def param_type(param):