diff --git a/.python-version b/.python-version index 6cb9d3dd..95ed564f 100644 --- a/.python-version +++ b/.python-version @@ -1 +1 @@ -3.4.3 +3.14.2 diff --git a/alplora/views.py b/alplora/views.py index d628cffc..5021c88d 100644 --- a/alplora/views.py +++ b/alplora/views.py @@ -1,7 +1,7 @@ from django.views.generic import TemplateView from django.utils.translation import get_language, get_language_info -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic.edit import FormView from django.contrib import messages from django.shortcuts import render diff --git a/datacenterlight/cms_toolbar.py b/datacenterlight/cms_toolbar.py index 15a8cb4b..466cce2f 100644 --- a/datacenterlight/cms_toolbar.py +++ b/datacenterlight/cms_toolbar.py @@ -1,6 +1,6 @@ from cms.extensions.toolbar import ExtensionToolbar from cms.toolbar_pool import toolbar_pool -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .cms_models import CMSFaviconExtension diff --git a/datacenterlight/tasks.py b/datacenterlight/tasks.py index 899b506f..deb6838a 100644 --- a/datacenterlight/tasks.py +++ b/datacenterlight/tasks.py @@ -7,7 +7,7 @@ from django.conf import settings from django.core.mail import EmailMessage from django.core.urlresolvers import reverse from django.utils import translation -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from dynamicweb.celery import app from hosting.models import HostingOrder diff --git a/datacenterlight/templatetags/custom_tags.py b/datacenterlight/templatetags/custom_tags.py index fc39eec7..d61e8c10 100644 --- a/datacenterlight/templatetags/custom_tags.py +++ b/datacenterlight/templatetags/custom_tags.py @@ -4,7 +4,7 @@ import logging from django import template from django.core.urlresolvers import resolve, reverse from django.utils.safestring import mark_safe -from django.utils.translation import activate, get_language, ugettext_lazy as _ +from django.utils.translation import activate, get_language, gettext_lazy as _ from hosting.models import GenericProduct, HostingOrder from utils.hosting_utils import get_ip_addresses diff --git a/datacenterlight/views.py b/datacenterlight/views.py index c708ff6a..fe88348e 100644 --- a/datacenterlight/views.py +++ b/datacenterlight/views.py @@ -12,7 +12,7 @@ from django.http import ( HttpResponseRedirect, JsonResponse, Http404, HttpResponse ) from django.shortcuts import render -from django.utils.translation import get_language, ugettext_lazy as _ +from django.utils.translation import get_language, gettext_lazy as _ from django.views.decorators.cache import cache_control from django.views.generic import FormView, CreateView, DetailView diff --git a/digitalglarus/forms.py b/digitalglarus/forms.py index 200099e3..3597f081 100644 --- a/digitalglarus/forms.py +++ b/digitalglarus/forms.py @@ -1,6 +1,6 @@ from django import forms from django.db.models import Q -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from utils.models import BillingAddress diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 64a63303..ead9c659 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -1,5 +1,5 @@ from django.conf.urls import url -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth import views as auth_views from . import views diff --git a/digitalglarus/views.py b/digitalglarus/views.py index bf3ed2c6..716e03c6 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -4,7 +4,7 @@ from django.conf import settings from django.shortcuts import render from django.http import HttpResponseRedirect, Http404 from django.core.urlresolvers import reverse_lazy, reverse -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.generic import TemplateView, UpdateView from django.contrib.auth.mixins import LoginRequiredMixin from django.utils.translation import get_language diff --git a/dynamicweb/settings-test/__init__.py b/dynamicweb/settings-test/__init__.py index 1a8babdd..3d66350a 100644 --- a/dynamicweb/settings-test/__init__.py +++ b/dynamicweb/settings-test/__init__.py @@ -5,7 +5,7 @@ Copyright 2015 ungleich. # -*- coding: utf-8 -*- # Build paths inside the project like this: os.path.join(BASE_DIR, ...) import os -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ # dotenv import dotenv diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py index b7705e17..cea56679 100644 --- a/dynamicweb/settings/base.py +++ b/dynamicweb/settings/base.py @@ -10,7 +10,7 @@ import os # dotenv import dotenv -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ logger = logging.getLogger(__name__) @@ -739,6 +739,7 @@ LDAP_CUSTOMER_GROUP_ID = int(env('LDAP_CUSTOMER_GROUP_ID')) LDAP_MAX_UID_FILE_PATH = os.environ.get('LDAP_MAX_UID_FILE_PATH', os.path.join(os.path.abspath(os.path.dirname(__file__)), 'ldap_max_uid_file') ) +print(os.environ) LDAP_DEFAULT_START_UID = int(env('LDAP_DEFAULT_START_UID')) # Search union over OUs diff --git a/hosting/forms.py b/hosting/forms.py index 8df2bd3e..aadf15b7 100644 --- a/hosting/forms.py +++ b/hosting/forms.py @@ -7,7 +7,7 @@ import xml from django import forms from django.conf import settings from django.contrib.auth import authenticate -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from membership.models import CustomUser from .models import UserHostingKey, GenericProduct diff --git a/hosting/views.py b/hosting/views.py index c2470707..e895e8df 100644 --- a/hosting/views.py +++ b/hosting/views.py @@ -23,7 +23,7 @@ from django.utils.decorators import method_decorator from django.utils.html import escape from django.utils.http import urlsafe_base64_decode from django.utils.safestring import mark_safe -from django.utils.translation import get_language, ugettext_lazy as _ +from django.utils.translation import get_language, gettext_lazy as _ from django.utils.translation import ugettext from django.views.decorators.cache import never_cache from django.views.generic import ( diff --git a/membership/forms.py b/membership/forms.py index a70b109d..58550f55 100644 --- a/membership/forms.py +++ b/membership/forms.py @@ -1,6 +1,6 @@ __author__ = 'tomislav' from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.contrib.auth import authenticate from .models import CreditCards diff --git a/membership/models.py b/membership/models.py index 81054fb9..3be626a1 100644 --- a/membership/models.py +++ b/membership/models.py @@ -12,7 +12,7 @@ from django.core.urlresolvers import reverse from django.core.validators import RegexValidator from django.db import models, IntegrityError from django.utils.crypto import get_random_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.exceptions import ValidationError from utils.mailer import BaseEmail diff --git a/nosystemd/forms.py b/nosystemd/forms.py index 8aa3eb35..6f66b572 100644 --- a/nosystemd/forms.py +++ b/nosystemd/forms.py @@ -1,5 +1,5 @@ from django import forms -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from utils.forms import LoginFormMixin, SignupFormMixin, BillingAddressForm diff --git a/templates/__init__.py b/templates/__init__.py index 44a1270e..f5f30f6d 100644 --- a/templates/__init__.py +++ b/templates/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# from django.utils.translation import ugettext_lazy as _ +# from django.utils.translation import gettext_lazy as _ # TEMPLATES = { # 'digitalglarus/about.html': _('DG.About'), # 'digitalglarus/contact.html': _('DG.Contact'), diff --git a/templates/cms/__init__.py b/templates/cms/__init__.py index f27d72f5..232f3c63 100644 --- a/templates/cms/__init__.py +++ b/templates/cms/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ TEMPLATES = { 'digitalglarus/about.html': _('DG.About'), 'digitalglarus/contact.html': _('DG.Contact'), diff --git a/templates/cms/digitalglarus/__init__.py b/templates/cms/digitalglarus/__init__.py index 7b16fec8..9793c25a 100644 --- a/templates/cms/digitalglarus/__init__.py +++ b/templates/cms/digitalglarus/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ TEMPLATES = { 'about.html': _('DG.About'), 'contact.html': _('DG.Contact'), diff --git a/templates/cms/ungleichch/__init__.py b/templates/cms/ungleichch/__init__.py index 403fbcc0..ba61977d 100644 --- a/templates/cms/ungleichch/__init__.py +++ b/templates/cms/ungleichch/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ TEMPLATES = { 'blog.html': _('Blog'), 'page.html': _('Page'), diff --git a/ungleich/cms_toolbar.py b/ungleich/cms_toolbar.py index c001cca8..09c16828 100644 --- a/ungleich/cms_toolbar.py +++ b/ungleich/cms_toolbar.py @@ -1,5 +1,5 @@ from cms.extensions.toolbar import ExtensionToolbar -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from cms.toolbar_pool import toolbar_pool diff --git a/ungleich/templates/cms/ungleichch/__init__.py b/ungleich/templates/cms/ungleichch/__init__.py index 43f88894..01c3db68 100644 --- a/ungleich/templates/cms/ungleichch/__init__.py +++ b/ungleich/templates/cms/ungleichch/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# from django.utils.translation import ugettext_lazy as _ +# from django.utils.translation import gettext_lazy as _ # TEMPLATES = { # 'blog_u.html': _('Blog'), # 'page.html': _('Page'), diff --git a/ungleich/views.py b/ungleich/views.py index af7cb304..0dc51c77 100644 --- a/ungleich/views.py +++ b/ungleich/views.py @@ -6,7 +6,7 @@ from django.utils.translation import get_language from djangocms_blog.models import Post from djangocms_blog.views import PostListView from djangocms_blog.settings import get_setting -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from djangocms_blog.models import BlogCategory diff --git a/ungleich_page/cms_menus.py b/ungleich_page/cms_menus.py index 4e17c352..415a12d1 100644 --- a/ungleich_page/cms_menus.py +++ b/ungleich_page/cms_menus.py @@ -1,6 +1,6 @@ from menus.base import NavigationNode from menus.menu_pool import menu_pool -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from cms.menu_bases import CMSAttachMenu from cms.templatetags.cms_tags import _get_placeholder from cms.utils.plugins import get_plugins diff --git a/ungleich_page/urls.py b/ungleich_page/urls.py index 607b7042..d359cd6b 100644 --- a/ungleich_page/urls.py +++ b/ungleich_page/urls.py @@ -1,6 +1,6 @@ from django.conf.urls import url from .views import ContactView, LandingView -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ urlpatterns = [ url(r'^$', LandingView.as_view(), name='landing'), diff --git a/ungleich_page/views.py b/ungleich_page/views.py index 01d1138d..521f18ba 100644 --- a/ungleich_page/views.py +++ b/ungleich_page/views.py @@ -1,7 +1,7 @@ from django.contrib import messages from django.views.generic.edit import FormView -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.core.urlresolvers import reverse_lazy from django.views.generic import View from django.shortcuts import render diff --git a/updated_requirements.txt b/updated_requirements.txt new file mode 100644 index 00000000..4b4b2305 --- /dev/null +++ b/updated_requirements.txt @@ -0,0 +1,102 @@ +Babel==2.3.4 +Django +Django-Select2==4.3.2 +Pillow==3.2.0 +URLObject==2.4.0 +Unidecode==0.04.19 +YURL==0.13 +aldryn-apphooks-config==0.2.7 +aldryn-boilerplates==0.7.4 +aldryn-categories==1.0.3 +aldryn-common==1.0.1 +aldryn-newsblog==1.2.1 +aldryn-people==1.2.0 +aldryn-reversion==1.0.8 +aldryn-search==0.2.11 +aldryn-translation-tools==0.2.1 +backport-collections==0.1 +cmsplugin-filer==1.0.1 +django-appconf==1.0.2 +django-appdata==0.1.5 +django-bootstrap3==7.0.1 +django-classy-tags==0.7.2 +django-cms==3.2.5 +django-compressor==2.0 +django-debug-toolbar==1.4 +python-dotenv==0.10.3 +django-extensions==1.6.7 +django-filer==1.2.0 +django-filter==0.13.0 +django-formtools==1.0 +django-guardian==1.4.4 +django-haystack==2.4.1 +django-meta==1.2 +django-meta-mixin==0.3.0 +django-model-utils==2.5 +django-mptt==0.8.4 +django-parler==1.6.3 +django-phonenumber-field==1.1.0 +django-polymorphic==0.8.1 +django-reversion==1.10.2 +django-sekizai==0.9.0 +django-sortedm2m==2.0.0 +django-spurl==0.6.4 +django-standard-form==1.1.1 +django-stored-messages==1.4.0 +django-taggit==0.18.3 +django-taggit-autosuggest==0.2.8 +django-taggit-templatetags==0.2.5 +django-templatetag-sugar==1.0 +django-treebeard==4.0.1 +djangocms-admin-style==1.1.1 +djangocms-apphook-setup==0.1.2 +djangocms-blog==0.9.0 +djangocms-file==1.0 +djangocms-flash==0.3.0 +djangocms-googlemap==0.4.0 +djangocms-inherit==0.2.1 +djangocms-link==1.7.2 +djangocms-page-meta==0.5.11 +djangocms-picture==1.0.0 +djangocms-teaser==0.2.0 +djangocms-text-ckeditor==2.9.3 +djangocms-video==1.0.0 +easy-thumbnails==2.3 +html5lib==0.9999999 +ldap3==2.6.1 +lxml==3.6.0 +model-mommy==1.2.6 +phonenumbers==7.4.0 +phonenumberslite==7.4.0 +psycopg2==2.7.3.2 +pycryptodome==3.6.6 +pylibmc==1.5.1 +python-dateutil==2.5.3 +python-slugify==1.2.0 +pytz==2016.4 +rcssmin==1.0.6 +requests==2.10.0 +rjsmin==1.0.12 +six==1.10.0 +sqlparse +stripe==2.41.0 +wheel==0.29.0 +django-admin-honeypot==1.0.0 +coverage==4.3.4 +git+https://github.com/ungleich/python-oca.git#egg=oca +djangorestframework==3.6.3 +flake8==3.3.0 +python-memcached==1.58 +celery==4.0.2 +redis==2.10.5 +django-celery-results==1.0.1 +kombu==4.1.0 +mccabe==0.6.1 +pycodestyle==2.3.1 +pyflakes==1.5.0 +billiard==3.5.0.3 +amqp==2.2.1 +vine==1.1.4 +cdist==5.0.1 +git+https://github.com/ungleich/djangocms-multisite.git#egg=djangocms_multisite +pyotp diff --git a/utils/forms.py b/utils/forms.py index 3cc57578..362c99db 100644 --- a/utils/forms.py +++ b/utils/forms.py @@ -2,7 +2,7 @@ from django import forms from django.contrib.auth import authenticate from django.core.mail import EmailMultiAlternatives from django.template.loader import render_to_string -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django_recaptcha.fields import ReCaptchaField diff --git a/utils/views.py b/utils/views.py index f30a349a..e39d20cd 100644 --- a/utils/views.py +++ b/utils/views.py @@ -10,7 +10,7 @@ from django.http import HttpResponseRedirect from django.shortcuts import render from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode -from django.utils.translation import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from django.views.decorators.cache import cache_control from django.views.generic import FormView, CreateView