Droped support for python 2.5

.travis.yml

@@ -1,6 +1,5 @@
 language: python
 python:
-  - "2.5"
   - "2.6"
   - "2.7"
 install:

INSTALL.txt

@@ -18,7 +18,7 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
   1. Check requirements:
 
         Make sure that you have installed Python Programming Language 2
-        (>= 2.5) on your system.
+        (>= 2.6) on your system.
 
   2. Setup a virtual environment with virtualenv (optional):
 
@@ -65,7 +65,7 @@ II. Installation on GNU/Linux and MacOSX using the sources
 
         OpenSlides requires following programs, which should be
         installed first:
-          + Python Programming Language 2 (>= 2.5)
+          + Python Programming Language 2 (>= 2.6)
           + virtualenv (>= 1.4.1)
           + ReportLab Toolkit
           + Python Imaging Library (PIL)
@@ -141,7 +141,7 @@ portable version you should run the following install steps.
 
         The OpenSlides install requires following programs, which should be
         installed first:
-          + Python Programming Language 2 (>= 2.5)
+          + Python Programming Language 2 (>= 2.6)
           + Setuptools
 
      a) Download and run 32bit MSI installer from http://www.python.org/:

openslides/main.py

@@ -10,9 +10,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 import base64
 import ctypes
 import optparse

openslides/motion/views.py

@@ -10,16 +10,10 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 import csv
 import os
 
-try:
+from urlparse import parse_qs
-    from urlparse import parse_qs
-except ImportError:  # python <= 2.5
-    from cgi import parse_qs
 
 from reportlab.lib import colors
 from reportlab.lib.units import cm

openslides/participant/api.py

@@ -10,9 +10,6 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from random import choice
 import csv
 

openslides/participant/views.py

@@ -10,15 +10,8 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-# for python 2.5 support
-from __future__ import with_statement
-
 from urllib import urlencode
-
+from urlparse import parse_qs
-try:
-    from urlparse import parse_qs
-except ImportError:  # python <= 2.5 grab it from cgi
-    from cgi import parse_qs
 
 from reportlab.lib import colors
 from reportlab.lib.units import cm

openslides/utils/pdf.py

@@ -21,8 +21,7 @@ from reportlab.rl_config import defaultPageSize
 
 from django.conf import settings
 from django.utils import formats
-# Import gettext for python 2.5 support
+from django.utils.translation import ugettext as _
-from django.utils.translation import ugettext as _, gettext
 
 from openslides.config.models import config
 

openslides/utils/utils.py

@@ -11,11 +11,7 @@
 """
 
 import sys
-
+import json
-try:
-    import json
-except ImportError:  # For python 2.5 support
-    import simplejson as json
 
 from django.contrib import messages
 from django.contrib.auth.models import Permission

openslides/utils/views.py

@@ -10,11 +10,7 @@
     :license: GNU GPL, see LICENSE for more details.
 """
 
-try:
+import json
-    import json
-except ImportError:
-    # for python 2.5 support
-    import simplejson as json
 
 try:
     from cStringIO import StringIO