forked from ungleich-public/dynamicweb
fix import 'reverse'
This commit is contained in:
parent
d693bd5377
commit
1ece5ce7c7
22 changed files with 125 additions and 145 deletions
|
|
@ -5,7 +5,7 @@ from celery.exceptions import MaxRetriesExceededError
|
|||
from celery.utils.log import get_task_logger
|
||||
from django.conf import settings
|
||||
from django.core.mail import EmailMessage
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.utils import translation
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ import datetime
|
|||
import logging
|
||||
|
||||
from django import template
|
||||
from django.core.urlresolvers import resolve, reverse
|
||||
from from django.urls import reverse import resolve, reverse
|
||||
from django.utils.safestring import mark_safe
|
||||
from django.utils.translation import activate, get_language, gettext_lazy as _
|
||||
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from django.conf import settings
|
|||
from django.contrib import messages
|
||||
from django.contrib.auth import login, authenticate
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.http import (
|
||||
HttpResponseRedirect, JsonResponse, Http404, HttpResponse
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from django.contrib import admin
|
|||
from .models import DGGallery, DGPicture, Booking, BookingPrice,\
|
||||
MembershipOrder, Membership, MembershipType, BookingOrder, BookingCancellation
|
||||
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from utils.models import ContactMessage
|
||||
from django.utils.html import format_html
|
||||
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.views.generic import UpdateView
|
||||
from django.db import models
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ from django.db import models
|
|||
from django.db.models import Q
|
||||
from cms.models import CMSPlugin
|
||||
from filer.fields.image import FilerImageField
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.utils.functional import cached_property
|
||||
from .mixins import Ordereable
|
||||
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ from unittest import mock, skipIf
|
|||
|
||||
from django.test import TestCase
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core.urlresolvers import resolve
|
||||
from django.urls import reverse
|
||||
from from django.urls import reverse import resolve
|
||||
from cms.test_utils.testcases import CMSTestCase
|
||||
from django.contrib.auth.tokens import default_token_generator
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ import logging
|
|||
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.urls import reverse_lazy, reverse
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.views.generic import TemplateView, UpdateView
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
|
|
|
|||
|
|
@ -96,7 +96,7 @@ INSTALLED_APPS = (
|
|||
'djangocms_multisite',
|
||||
'easy_thumbnails',
|
||||
'utils',
|
||||
'stored_messages',
|
||||
#'stored_messages',
|
||||
'mptt',
|
||||
'parler',
|
||||
'guardian',
|
||||
|
|
@ -104,43 +104,43 @@ INSTALLED_APPS = (
|
|||
'taggit_autosuggest',
|
||||
# 'django_select2',
|
||||
'meta',
|
||||
'meta_mixin',
|
||||
#'meta_mixin',
|
||||
'bootstrap3',
|
||||
'compressor',
|
||||
'filer',
|
||||
'djangocms_blog',
|
||||
'cms', # django CMS itself
|
||||
'aldryn_apphooks_config',
|
||||
'aldryn_boilerplates',
|
||||
'aldryn_categories',
|
||||
'aldryn_common',
|
||||
'aldryn_newsblog',
|
||||
'aldryn_people',
|
||||
'aldryn_reversion',
|
||||
'aldryn_translation_tools',
|
||||
#TODO'cms', # django CMS itself
|
||||
#TODO'aldryn_apphooks_config',
|
||||
#TODO'aldryn_boilerplates',
|
||||
#TODO'aldryn_categories',
|
||||
#TODO'aldryn_common',
|
||||
#TODO'aldryn_newsblog',
|
||||
#TODO'aldryn_people',
|
||||
#TODO'aldryn_reversion',
|
||||
#TODO'aldryn_translation_tools',
|
||||
'treebeard', # utilities for implementing a tree
|
||||
'sekizai', # for javascript and css management
|
||||
'menus', # helper for model independent hierarchical website navigation
|
||||
'cmsplugin_filer_image',
|
||||
#TODO'menus', # helper for model independent hierarchical website navigation
|
||||
#TODO'cmsplugin_filer_image',
|
||||
|
||||
# 2nd migrate
|
||||
# django-cms plugins
|
||||
'djangocms_file',
|
||||
'djangocms_picture',
|
||||
'djangocms_video',
|
||||
'django_recaptcha',
|
||||
#TODO'djangocms_file',
|
||||
#TODO'djangocms_picture',
|
||||
#TODO'djangocms_video',
|
||||
#TODO'django_recaptcha',
|
||||
# 'djangocms_flash',
|
||||
# 'djangocms_googlemap',
|
||||
# 'djangocms_inherit',
|
||||
# 'djangocms_link',
|
||||
# 'djangocms_teaser',
|
||||
'djangocms_page_meta',
|
||||
#TODO 'djangocms_page_meta',
|
||||
'djangocms_text_ckeditor',
|
||||
'cmsplugin_filer_file',
|
||||
'cmsplugin_filer_folder',
|
||||
'cmsplugin_filer_link',
|
||||
#TODO'cmsplugin_filer_file',
|
||||
#TODO'cmsplugin_filer_folder',
|
||||
#TODO 'cmsplugin_filer_link',
|
||||
# 'cmsplugin_filer_teaser',
|
||||
'cmsplugin_filer_video',
|
||||
#'cmsplugin_filer_video',
|
||||
#
|
||||
# blog
|
||||
# versioning
|
||||
|
|
@ -739,7 +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
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ from webhook import views as webhook_views
|
|||
from membership import urls as membership_urls
|
||||
from ungleich_page.views import LandingView
|
||||
from django.views.generic import RedirectView
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
import debug_toolbar
|
||||
|
||||
urlpatterns = [
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from django.shortcuts import redirect
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
|
||||
from opennebula_api.serializers import VirtualMachineTemplateSerializer
|
||||
from opennebula_api.models import OpenNebulaManager
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from django.conf import settings
|
||||
from django.test import TestCase
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core.urlresolvers import resolve
|
||||
from django.urls import reverse
|
||||
from from django.urls import reverse import resolve
|
||||
from django.contrib.auth.tokens import default_token_generator
|
||||
from django.utils.http import urlsafe_base64_encode
|
||||
from django.utils.encoding import force_bytes
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@ from django.contrib.auth.tokens import default_token_generator
|
|||
from django.core.exceptions import ValidationError
|
||||
from django.core.files.base import ContentFile
|
||||
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
|
||||
from django.core.urlresolvers import reverse_lazy, reverse
|
||||
from django.urls import reverse_lazy, reverse
|
||||
from django.db.models import Q
|
||||
from django.http import (
|
||||
Http404, HttpResponseRedirect, HttpResponse, JsonResponse
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ from django.contrib.auth.hashers import make_password
|
|||
from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, \
|
||||
PermissionsMixin
|
||||
from django.contrib.sites.models import Site
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
from django.core.validators import RegexValidator
|
||||
from django.db import models, IntegrityError
|
||||
from django.utils.crypto import get_random_string
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# import re
|
||||
|
||||
# from django.test import TestCase
|
||||
# from django.core.urlresolvers import reverse
|
||||
# from django.urls import reverse
|
||||
# from django.core import mail
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from django.contrib import admin
|
||||
from django.utils.html import format_html
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.urls import reverse
|
||||
|
||||
from .models import Donation
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from django.views.generic import TemplateView, FormView, DetailView, UpdateView,
|
|||
ListView
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import render
|
||||
from django.core.urlresolvers import reverse_lazy, reverse
|
||||
from django.urls import reverse_lazy, reverse
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.conf import settings
|
||||
from django.contrib import messages
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
from utils.tests import BaseTestCase
|
||||
from django.conf import settings
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core.urlresolvers import resolve
|
||||
from django.urls import reverse
|
||||
from from django.urls import reverse import resolve
|
||||
from django.utils.translation import get_language
|
||||
from django.utils.translation import activate
|
||||
from djangocms_blog.settings import get_setting
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from django.test import TestCase
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.core.urlresolvers import resolve
|
||||
from django.urls import reverse
|
||||
from from django.urls import reverse import resolve
|
||||
|
||||
|
||||
class ContactViewTest(TestCase):
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ from django.contrib import messages
|
|||
|
||||
from django.views.generic.edit import FormView
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
from django.views.generic import View
|
||||
from django.shortcuts import render
|
||||
|
||||
|
|
|
|||
|
|
@ -1,102 +1,82 @@
|
|||
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
|
||||
aldryn-apphooks-config==0.7.0
|
||||
aldryn-boilerplates==0.8.0
|
||||
aldryn-common==1.0.5
|
||||
aldryn-newsblog==2.2.1
|
||||
aldryn-people==2.2.0
|
||||
aldryn-translation-tools==0.3.0
|
||||
amqp==5.4.0
|
||||
asgiref==3.12.1
|
||||
babel==2.18.0
|
||||
backport_collections==0.1
|
||||
billiard==4.3.0
|
||||
celery==5.6.3
|
||||
certifi==2026.7.22
|
||||
charset-normalizer==3.5.2
|
||||
click==8.5.0
|
||||
click-didyoumean==0.3.1
|
||||
click-plugins==1.1.1.2
|
||||
click-repl==0.4.0
|
||||
Django==6.1.1
|
||||
django-appconf==1.2.0
|
||||
django-appdata==0.4.0
|
||||
django-bootstrap3==26.2
|
||||
django-classy-tags==0.8.0
|
||||
django-cms==3.5.4
|
||||
django-filer==3.6.0
|
||||
django-formtools==2.1
|
||||
django-guardian==3.5.0
|
||||
django-js-asset==4.2.0
|
||||
django-meta==2.5.1
|
||||
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-mptt==0.18.0
|
||||
django-multisite==1.9.0
|
||||
django-parler==2.4
|
||||
django-phonenumber-field==1.3.0
|
||||
django-polymorphic==4.11.7
|
||||
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-sekizai==0.10.0
|
||||
django-sortedm2m==4.0.0
|
||||
django-taggit==6.1.0
|
||||
django-taggit-autosuggest==0.4.2
|
||||
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
|
||||
django-treebeard==4.3.1
|
||||
django_compressor==4.6.0
|
||||
djangocms-admin-style==3.3.1
|
||||
djangocms-apphook-setup==0.5.1
|
||||
djangocms-blog==2.0.10
|
||||
djangocms-multisite==0.3.1
|
||||
djangocms-text-ckeditor==5.1.7
|
||||
easy-thumbnails==2.10.1
|
||||
html5lib==1.1
|
||||
idna==3.20
|
||||
kombu==5.6.2
|
||||
lxml==6.1.3
|
||||
packaging==26.3
|
||||
phonenumbers==9.0.40
|
||||
phonenumberslite==9.0.40
|
||||
pillow==12.3.0
|
||||
pluggy==0.13.1
|
||||
prompt_toolkit==3.0.53
|
||||
py_svg_hush==0.3.0
|
||||
python-dateutil==2.9.0.post0
|
||||
python-dotenv==1.2.3
|
||||
python-slugify==9.1.2
|
||||
pytz==2026.4
|
||||
rcssmin==1.2.2
|
||||
requests==2.34.2
|
||||
requests-file==3.0.1
|
||||
rjsmin==1.2.5
|
||||
six==1.17.0
|
||||
sqlparse==0.6.0
|
||||
text-unidecode==1.3
|
||||
tldextract==2.2.3
|
||||
typing_extensions==4.16.0
|
||||
tzdata==2026.4
|
||||
tzlocal==5.4.4
|
||||
Unidecode==1.4.0
|
||||
urllib3==2.8.0
|
||||
vine==5.1.0
|
||||
wcwidth==0.9.1
|
||||
webencodings==0.6.1
|
||||
YURL==1.0.0
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ from django.contrib import messages
|
|||
from django.contrib.auth import authenticate, login
|
||||
from django.contrib.auth.tokens import default_token_generator
|
||||
from django.core.files.base import ContentFile
|
||||
from django.core.urlresolvers import reverse_lazy
|
||||
from django.urls import reverse_lazy
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import render
|
||||
from django.utils.encoding import force_bytes
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue