bruks first commit

.python-version

@@ -1 +1 @@
-3.4.3
+3.14.2

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

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
 

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

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

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
 

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

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

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

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
 

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

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

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 (

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

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

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

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'),

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'),

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'),

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'),

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
 

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'),

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
 
 

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

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'),

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

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

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
 

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