Revision 6b256427

b/docs/quick-install-admin-guide.rst
767 767
previously used to set astakos specific settings.
768 768

  
769 769
Refer to
770
`Django documentation <https://docs.djangoproject.com/en/1.2/topics/email/>`_
770
`Django documentation <https://docs.djangoproject.com/en/1.4/topics/email/>`_
771 771
for additional information on available email settings.
772 772

  
773 773
As refered in the previous section, based on the operation that triggers
b/snf-astakos-app/astakos/api/keystone_urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, url
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, url
38

  
34
from django.conf.urls import patterns, url
39 35
from snf_django.lib.api import api_endpoint_not_found
40 36

  
41 37
urlpatterns = patterns(
b/snf-astakos-app/astakos/api/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, url, include
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, url, include
38

  
34
from django.conf.urls import patterns, url, include
39 35
from snf_django.lib.api import api_endpoint_not_found
40 36

  
41 37

  
b/snf-astakos-app/astakos/im/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, url
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, url
38

  
39

  
34
from django.conf.urls import patterns, url
40 35
from astakos.im.forms import (
41 36
    ExtendedPasswordResetForm,
42 37
    ExtendedPasswordChangeForm,
43 38
    ExtendedSetPasswordForm, LoginForm)
44

  
45 39
from astakos.im import settings
46 40

  
47 41
urlpatterns = patterns(
b/snf-astakos-app/astakos/im/weblogin_urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import url
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import url
34
from django.conf.urls import url
38 35

  
39 36
urlpatterns = (
40 37
    url(r'^login$', 'astakos.im.views.target.redirect.login',
b/snf-astakos-app/astakos/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import include, patterns
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import include, patterns
34
from django.conf.urls import include, patterns
38 35

  
39 36
from astakos.im.settings import (
40 37
    BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX, WEBLOGIN_PREFIX)
b/snf-astakos-app/setup.py
65 65

  
66 66
# Package requirements
67 67
INSTALL_REQUIRES = [
68
    'Django>=1.2, <1.5',
68
    'Django>=1.4, <1.5',
69 69
    'South>=0.7.3',
70 70
    'httplib2>=0.6.0',
71 71
    'snf-common',
b/snf-cyclades-app/setup.py
58 58

  
59 59
# Package requirements
60 60
INSTALL_REQUIRES = [
61
    'Django >=1.2, <1.5',
61
    'Django>=1.4, <1.5',
62 62
    'simplejson>=2.1.1',
63 63
    'pycurl>=7.19.0',
64 64
    'python-dateutil>=1.4.1',
b/snf-cyclades-app/synnefo/admin/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import url, patterns
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import url, patterns
34
from django.conf.urls import url, patterns
38 35

  
39 36
from synnefo.admin import views
40 37
from django.http import Http404
b/snf-cyclades-app/synnefo/api/extensions.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns
34
from django.conf.urls import patterns
38 35

  
39 36
from django.http import HttpResponse
40 37
from django.utils import simplejson as json
b/snf-cyclades-app/synnefo/api/flavors.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from logging import getLogger
35

  
36
try:
37
    from django.conf.urls import patterns
38
except ImportError:  # Django==1.2
39
    from django.conf.urls.defaults import patterns
35
from django.conf.urls import patterns
40 36

  
41 37
from django.http import HttpResponse
42 38
from django.template.loader import render_to_string
b/snf-cyclades-app/synnefo/api/images.py
36 36

  
37 37
from dateutil.parser import parse as date_parse
38 38

  
39
try:
40
    from django.conf.urls import patterns
41
except ImportError:  # Django==1.2
42
    from django.conf.urls.defaults import patterns
43

  
39
from django.conf.urls import patterns
44 40
from django.http import HttpResponse
45 41
from django.template.loader import render_to_string
46 42
from django.utils import simplejson as json
b/snf-cyclades-app/synnefo/api/networks.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33
from django.conf import settings
34
try:
35
    from django.conf.urls import patterns
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns
34
from django.conf.urls import patterns
38 35

  
39 36
from django.db.models import Q
40 37
from django.http import HttpResponse
b/snf-cyclades-app/synnefo/api/servers.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from django.conf import settings
35
try:
36
    from django.conf.urls import patterns
37
except ImportError:  # Django==1.2
38
    from django.conf.urls.defaults import patterns
35
from django.conf.urls import patterns
39 36

  
40 37
from django.db import transaction
41 38
from django.http import HttpResponse
b/snf-cyclades-app/synnefo/api/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import include, patterns
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import include, patterns
38

  
34
from django.conf.urls import include, patterns
39 35

  
40 36
from snf_django.lib.api import api_endpoint_not_found
41 37
from synnefo.api import (servers, flavors, images, networks, extensions,
b/snf-cyclades-app/synnefo/app_settings/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, include
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, include
34
from django.conf.urls import patterns, include
38 35

  
39 36
from snf_django.lib.api.proxy import proxy
40 37
from snf_django.lib.api.utils import prefix_pattern
b/snf-cyclades-app/synnefo/helpdesk/urls.py
1
try:
2
    from django.conf.urls import patterns, url
3
except ImportError:  # Django==1.2
4
    from django.conf.urls.defaults import patterns, url
5

  
1
from django.conf.urls import patterns, url
6 2

  
7 3
urlpatterns = patterns(
8 4
    '',
b/snf-cyclades-app/synnefo/plankton/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, include
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, include
34
from django.conf.urls import patterns, include
38 35

  
39 36
from django.http import HttpResponseNotAllowed
40 37
from snf_django.lib.api import api_endpoint_not_found
b/snf-cyclades-app/synnefo/ui/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33
#
34
try:
35
    from django.conf.urls import patterns, url
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, url
34
from django.conf.urls import patterns, url
38 35

  
39 36
from django.conf import settings
40 37

  
b/snf-cyclades-app/synnefo/userdata/urls.py
32 32
# interpreted as representing official policies, either expressed
33 33
# or implied, of GRNET S.A.
34 34

  
35
try:
36
    from django.conf.urls import patterns, url
37
except ImportError:  # Django==1.2
38
    from django.conf.urls.defaults import patterns, url
35
from django.conf.urls import patterns, url
39 36

  
40 37
from synnefo.userdata import views
41 38
from django.http import Http404
b/snf-cyclades-app/synnefo/vmapi/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, url
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, url
34
from django.conf.urls import patterns, url
38 35

  
39 36
from snf_django.lib.api import api_endpoint_not_found
40 37

  
b/snf-django-lib/setup.py
58 58

  
59 59
# Package requirements
60 60
INSTALL_REQUIRES = [
61
    'Django >=1.2, <1.5',
61
    'Django>=1.4, <1.5',
62 62
    'simplejson>=2.1.1',
63 63
    'astakosclient',
64 64
    'snf-common',
b/snf-django-lib/snf_django/lib/api/__init__.py
190 190
        response["Date"] = format_date_time(time())
191 191

  
192 192
    if not response.has_header("Content-Length"):
193
        # compatibility code for django 1.4
194
        _is_string = getattr(response, '_is_string', None)  # Django==1.2
195 193
        _base_content_is_iter = getattr(response, '_base_content_is_iter',
196 194
                                        None)
197
        if (_is_string is not None and _is_string) or\
198
                (_base_content_is_iter is not None and
199
                    not _base_content_is_iter):
195
        if (_base_content_is_iter is not None and not _base_content_is_iter):
200 196
            response["Content-Length"] = len(response.content)
201 197
        else:
202 198
            if not (response.has_header('Content-Type') and
b/snf-django-lib/snf_django/lib/api/urls.py
33 33

  
34 34
from django.core import urlresolvers
35 35
from django.views.decorators import csrf
36
try:
37
    from django.conf.urls import patterns
38
except ImportError:  # Django==1.2
39
    from django.conf.urls.defaults import patterns
36
from django.conf.urls import patterns
40 37

  
41 38

  
42 39
def _patch_pattern(regex_pattern):
......
45 42
    RegexURLPattern callback to get resolved if required.
46 43

  
47 44
    """
48
    if hasattr(regex_pattern, "_get_callback"):  # Django==1.2
49
        if not regex_pattern._callback:
50
            # enforce _callback resolving
51
            regex_pattern._get_callback()
52

  
53
        regex_pattern._callback = \
54
            csrf.csrf_exempt(regex_pattern._callback)
55
    else:
56
        regex_pattern._callback = \
57
            csrf.csrf_exempt(regex_pattern.callback)
45
    regex_pattern._callback = \
46
        csrf.csrf_exempt(regex_pattern.callback)
58 47

  
59 48

  
60 49
def _patch_resolver(r):
61 50
    """
62 51
    Patch all patterns found in resolver with _patch_pattern
63 52
    """
64
    if hasattr(r, '_get_url_patterns'):  # Django ==1.2
65
        entries = r._get_url_patterns()
66
    elif hasattr(r, 'url_patterns'):
53
    if hasattr(r, 'url_patterns'):
67 54
        entries = r.url_patterns
68 55
    else:
69 56
        # first level view in patterns ?
b/snf-django-lib/snf_django/utils/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34

  
35
try:
36
    from django.conf.urls import url, patterns
37
except ImportError:  # Django==1.2
38
    from django.conf.urls.defaults import url, patterns
34
from django.conf.urls import url, patterns
39 35

  
40 36
from snf_django.lib.api.utils import prefix_pattern
41 37
from synnefo.lib.services import get_service_path
b/snf-pithos-app/pithos/api/urls.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from functools import partial
35
try:
36
    from django.conf.urls import include, patterns
37
except ImportError:  # Django==1.2
38
    from django.conf.urls.defaults import include, patterns
35
from django.conf.urls import include, patterns
39 36

  
40 37
from snf_django.lib.api.proxy import proxy
41 38
from snf_django.lib.api.utils import prefix_pattern
b/snf-pithos-app/setup.py
60 60
INSTALL_REQUIRES = [
61 61
    'snf-common',
62 62
    'snf-pithos-backend',
63
    'Django>=1.2, <1.5',
63
    'Django>=1.4, <1.5',
64 64
    'objpool>=0.3',
65 65
    'astakosclient',
66 66
    'snf-django-lib',
b/snf-stats-app/setup.py
57 57
INSTALL_REQUIRES = [
58 58
    'gdmodule',
59 59
    'py-rrdtool',
60
    'Django>=1.2, <=1.5',
60
    'Django>=1.4, <1.5',
61 61
    'snf-django-lib',
62 62
]
63 63

  
b/snf-stats-app/synnefo_stats/urls.py
31 31
# interpreted as representing official policies, either expressed
32 32
# or implied, of GRNET S.A.
33 33

  
34
try:
35
    from django.conf.urls import patterns, include
36
except ImportError:  # Django==1.2
37
    from django.conf.urls.defaults import patterns, include
34
from django.conf.urls import patterns, include
38 35

  
39 36
from snf_django.lib.api.utils import prefix_pattern
40 37
from snf_django.lib.api import api_endpoint_not_found
b/snf-webproject/setup.py
58 58

  
59 59
# Package requirements
60 60
INSTALL_REQUIRES = [
61
        'Django >=1.2, <1.5',
61
        'Django>=1.4, <1.5',
62 62
        'snf-common',
63 63
]
64 64

  

Also available in: Unified diff