Request Django=>1.4, <1.5

Drop support for Django 1.2. Remove compatibility code that were used in
order to support Django 1.2 and 1.4. Finally update django documentation
link in the docs.

docs/quick-install-admin-guide.rst

@@ -767,7 +767,7 @@ astakos they are defined in a different configuration file than the one
 previously used to set astakos specific settings.
 
 Refer to
-`Django documentation <https://docs.djangoproject.com/en/1.2/topics/email/>`_
+`Django documentation <https://docs.djangoproject.com/en/1.4/topics/email/>`_
 for additional information on available email settings.
 
 As refered in the previous section, based on the operation that triggers

snf-astakos-app/astakos/api/keystone_urls.py

@@ -31,11 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
-
+from django.conf.urls import patterns, url
 from snf_django.lib.api import api_endpoint_not_found
 
 urlpatterns = patterns(

snf-astakos-app/astakos/api/urls.py

@@ -31,11 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, url, include
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url, include
-
+from django.conf.urls import patterns, url, include
 from snf_django.lib.api import api_endpoint_not_found
 
 

snf-astakos-app/astakos/im/urls.py

@@ -31,17 +31,11 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
-
-
+from django.conf.urls import patterns, url
 from astakos.im.forms import (
     ExtendedPasswordResetForm,
     ExtendedPasswordChangeForm,
     ExtendedSetPasswordForm, LoginForm)
-
 from astakos.im import settings
 
 urlpatterns = patterns(

snf-astakos-app/astakos/im/weblogin_urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import url
+from django.conf.urls import url
 
 urlpatterns = (
     url(r'^login$', 'astakos.im.views.target.redirect.login',

snf-astakos-app/astakos/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import include, patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
 
 from astakos.im.settings import (
     BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX, WEBLOGIN_PREFIX)

snf-astakos-app/setup.py

@@ -65,7 +65,7 @@ CLASSIFIERS = [
 
 # Package requirements
 INSTALL_REQUIRES = [
-    'Django>=1.2, <1.5',
+    'Django>=1.4, <1.5',
     'South>=0.7.3',
     'httplib2>=0.6.0',
     'snf-common',

snf-cyclades-app/setup.py

@@ -58,7 +58,7 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
-    'Django >=1.2, <1.5',
+    'Django>=1.4, <1.5',
     'simplejson>=2.1.1',
     'pycurl>=7.19.0',
     'python-dateutil>=1.4.1',

snf-cyclades-app/synnefo/admin/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import url, patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from synnefo.admin import views
 from django.http import Http404

snf-cyclades-app/synnefo/api/extensions.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 from django.http import HttpResponse
 from django.utils import simplejson as json

snf-cyclades-app/synnefo/api/flavors.py

@@ -32,11 +32,7 @@
 # or implied, of GRNET S.A.
 
 from logging import getLogger
-
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 from django.http import HttpResponse
 from django.template.loader import render_to_string

snf-cyclades-app/synnefo/api/images.py

@@ -36,11 +36,7 @@ from itertools import ifilter
 
 from dateutil.parser import parse as date_parse
 
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
-
+from django.conf.urls import patterns
 from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils import simplejson as json

snf-cyclades-app/synnefo/api/networks.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 from django.conf import settings
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 from django.db.models import Q
 from django.http import HttpResponse

snf-cyclades-app/synnefo/api/servers.py

@@ -32,10 +32,7 @@
 # or implied, of GRNET S.A.
 
 from django.conf import settings
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 from django.db import transaction
 from django.http import HttpResponse

snf-cyclades-app/synnefo/api/urls.py

@@ -31,11 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import include, patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import include, patterns
-
+from django.conf.urls import include, patterns
 
 from snf_django.lib.api import api_endpoint_not_found
 from synnefo.api import (servers, flavors, images, networks, extensions,

snf-cyclades-app/synnefo/app_settings/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, include
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, include
+from django.conf.urls import patterns, include
 
 from snf_django.lib.api.proxy import proxy
 from snf_django.lib.api.utils import prefix_pattern

snf-cyclades-app/synnefo/helpdesk/urls.py

-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
-
+from django.conf.urls import patterns, url
 
 urlpatterns = patterns(
     '',

snf-cyclades-app/synnefo/plankton/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, include
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, include
+from django.conf.urls import patterns, include
 
 from django.http import HttpResponseNotAllowed
 from snf_django.lib.api import api_endpoint_not_found

snf-cyclades-app/synnefo/ui/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 #
-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from django.conf import settings
 

snf-cyclades-app/synnefo/userdata/urls.py

@@ -32,10 +32,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from synnefo.userdata import views
 from django.http import Http404

snf-cyclades-app/synnefo/vmapi/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, url
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, url
+from django.conf.urls import patterns, url
 
 from snf_django.lib.api import api_endpoint_not_found
 

snf-django-lib/setup.py

@@ -58,7 +58,7 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
-    'Django >=1.2, <1.5',
+    'Django>=1.4, <1.5',
     'simplejson>=2.1.1',
     'astakosclient',
     'snf-common',

snf-django-lib/snf_django/lib/api/__init__.py

@@ -190,13 +190,9 @@ def update_response_headers(request, response):
         response["Date"] = format_date_time(time())
 
     if not response.has_header("Content-Length"):
-        # compatibility code for django 1.4
-        _is_string = getattr(response, '_is_string', None)  # Django==1.2
         _base_content_is_iter = getattr(response, '_base_content_is_iter',
                                         None)
-        if (_is_string is not None and _is_string) or\
-                (_base_content_is_iter is not None and
-                    not _base_content_is_iter):
+        if (_base_content_is_iter is not None and not _base_content_is_iter):
             response["Content-Length"] = len(response.content)
         else:
             if not (response.has_header('Content-Type') and

snf-django-lib/snf_django/lib/api/urls.py

@@ -33,10 +33,7 @@
 
 from django.core import urlresolvers
 from django.views.decorators import csrf
-try:
-    from django.conf.urls import patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 
 def _patch_pattern(regex_pattern):
@@ -45,25 +42,15 @@ def _patch_pattern(regex_pattern):
     RegexURLPattern callback to get resolved if required.
 
     """
-    if hasattr(regex_pattern, "_get_callback"):  # Django==1.2
-        if not regex_pattern._callback:
-            # enforce _callback resolving
-            regex_pattern._get_callback()
-
-        regex_pattern._callback = \
-            csrf.csrf_exempt(regex_pattern._callback)
-    else:
-        regex_pattern._callback = \
-            csrf.csrf_exempt(regex_pattern.callback)
+    regex_pattern._callback = \
+        csrf.csrf_exempt(regex_pattern.callback)
 
 
 def _patch_resolver(r):
     """
     Patch all patterns found in resolver with _patch_pattern
     """
-    if hasattr(r, '_get_url_patterns'):  # Django ==1.2
-        entries = r._get_url_patterns()
-    elif hasattr(r, 'url_patterns'):
+    if hasattr(r, 'url_patterns'):
         entries = r.url_patterns
     else:
         # first level view in patterns ?

snf-django-lib/snf_django/utils/urls.py

@@ -31,11 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-
-try:
-    from django.conf.urls import url, patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import url, patterns
+from django.conf.urls import url, patterns
 
 from snf_django.lib.api.utils import prefix_pattern
 from synnefo.lib.services import get_service_path

snf-pithos-app/pithos/api/urls.py

@@ -32,10 +32,7 @@
 # or implied, of GRNET S.A.
 
 from functools import partial
-try:
-    from django.conf.urls import include, patterns
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import include, patterns
+from django.conf.urls import include, patterns
 
 from snf_django.lib.api.proxy import proxy
 from snf_django.lib.api.utils import prefix_pattern

snf-pithos-app/setup.py

@@ -60,7 +60,7 @@ CLASSIFIERS = []
 INSTALL_REQUIRES = [
     'snf-common',
     'snf-pithos-backend',
-    'Django>=1.2, <1.5',
+    'Django>=1.4, <1.5',
     'objpool>=0.3',
     'astakosclient',
     'snf-django-lib',

snf-stats-app/setup.py

@@ -57,7 +57,7 @@ CLASSIFIERS = []
 INSTALL_REQUIRES = [
     'gdmodule',
     'py-rrdtool',
-    'Django>=1.2, <=1.5',
+    'Django>=1.4, <1.5',
     'snf-django-lib',
 ]
 

snf-stats-app/synnefo_stats/urls.py

@@ -31,10 +31,7 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-try:
-    from django.conf.urls import patterns, include
-except ImportError:  # Django==1.2
-    from django.conf.urls.defaults import patterns, include
+from django.conf.urls import patterns, include
 
 from snf_django.lib.api.utils import prefix_pattern
 from snf_django.lib.api import api_endpoint_not_found

snf-webproject/setup.py

@@ -58,7 +58,7 @@ CLASSIFIERS = []
 
 # Package requirements
 INSTALL_REQUIRES = [
-        'Django >=1.2, <1.5',
+        'Django>=1.4, <1.5',
         'snf-common',
 ]