Droped support for python 2.5

This commit is contained in:
Oskar Hahn 2012-12-14 14:21:53 +01:00
parent a07146098b
commit 366b8e0f1f
9 changed files with 8 additions and 37 deletions

View File

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

View File

@ -18,7 +18,7 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI)
1. Check requirements: 1. Check requirements:
Make sure that you have installed Python Programming Language 2 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): 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 OpenSlides requires following programs, which should be
installed first: installed first:
+ Python Programming Language 2 (>= 2.5) + Python Programming Language 2 (>= 2.6)
+ virtualenv (>= 1.4.1) + virtualenv (>= 1.4.1)
+ ReportLab Toolkit + ReportLab Toolkit
+ Python Imaging Library (PIL) + 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 The OpenSlides install requires following programs, which should be
installed first: installed first:
+ Python Programming Language 2 (>= 2.5) + Python Programming Language 2 (>= 2.6)
+ Setuptools + Setuptools
a) Download and run 32bit MSI installer from http://www.python.org/: a) Download and run 32bit MSI installer from http://www.python.org/:

View File

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

View File

@ -10,16 +10,10 @@
:license: GNU GPL, see LICENSE for more details. :license: GNU GPL, see LICENSE for more details.
""" """
# for python 2.5 support
from __future__ import with_statement
import csv import csv
import os 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 import colors
from reportlab.lib.units import cm from reportlab.lib.units import cm

View File

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

View File

@ -10,15 +10,8 @@
:license: GNU GPL, see LICENSE for more details. :license: GNU GPL, see LICENSE for more details.
""" """
# for python 2.5 support
from __future__ import with_statement
from urllib import urlencode 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 import colors
from reportlab.lib.units import cm from reportlab.lib.units import cm

View File

@ -21,8 +21,7 @@ from reportlab.rl_config import defaultPageSize
from django.conf import settings from django.conf import settings
from django.utils import formats 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 from openslides.config.models import config

View File

@ -11,11 +11,7 @@
""" """
import sys 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 import messages
from django.contrib.auth.models import Permission from django.contrib.auth.models import Permission

View File

@ -10,11 +10,7 @@
:license: GNU GPL, see LICENSE for more details. :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: try:
from cStringIO import StringIO from cStringIO import StringIO