0001-trivial-import-reverse-from-django.urls-41285.patch
combo/apps/assets/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.utils.translation import ugettext_lazy as _ |
20 | 20 | |
21 | 21 |
combo/apps/assets/views.py | ||
---|---|---|
22 | 22 |
from django.contrib import messages |
23 | 23 |
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied |
24 | 24 |
from django.core.files.storage import default_storage |
25 |
from django.core.urlresolvers import reverse, reverse_lazy
|
|
25 |
from django.urls import reverse, reverse_lazy
|
|
26 | 26 |
from django.http import Http404, HttpResponse |
27 | 27 |
from django.shortcuts import get_object_or_404 |
28 | 28 |
from django.shortcuts import redirect |
combo/apps/dashboard/views.py | ||
---|---|---|
19 | 19 |
from django.conf import settings |
20 | 20 |
from django.contrib.contenttypes.models import ContentType |
21 | 21 |
from django.core.exceptions import PermissionDenied |
22 |
from django.core.urlresolvers import reverse
|
|
22 |
from django.urls import reverse
|
|
23 | 23 |
from django.db.models import Max, Min |
24 | 24 |
from django.http import Http404, HttpResponse, HttpResponseRedirect |
25 | 25 |
from django.utils.encoding import force_text |
combo/apps/dataviz/models.py | ||
---|---|---|
17 | 17 |
import copy |
18 | 18 |
import os |
19 | 19 | |
20 |
from django.core.urlresolvers import reverse
|
|
20 |
from django.urls import reverse
|
|
21 | 21 |
from django.db import models |
22 | 22 |
from django.utils.encoding import force_text |
23 | 23 |
from django.utils.translation import ugettext_lazy as _, ungettext, gettext |
combo/apps/gallery/views.py | ||
---|---|---|
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 |
from django.core.urlresolvers import reverse, reverse_lazy
|
|
17 |
from django.urls import reverse, reverse_lazy
|
|
18 | 18 |
from django.shortcuts import redirect |
19 | 19 |
from django.views.generic import (TemplateView, RedirectView, DetailView, |
20 | 20 |
CreateView, UpdateView, ListView, DeleteView, FormView) |
combo/apps/lingo/__init__.py | ||
---|---|---|
18 | 18 |
import logging |
19 | 19 | |
20 | 20 |
import django.apps |
21 |
from django.core.urlresolvers import reverse
|
|
21 |
from django.urls import reverse
|
|
22 | 22 |
from django.utils import timezone |
23 | 23 |
from django.utils.translation import ugettext_lazy as _ |
24 | 24 |
combo/apps/lingo/manager_views.py | ||
---|---|---|
18 | 18 |
import datetime |
19 | 19 |
from dateutil import parser as date_parser |
20 | 20 | |
21 |
from django.core.urlresolvers import reverse
|
|
22 |
from django.core.urlresolvers import reverse_lazy
|
|
21 |
from django.urls import reverse
|
|
22 |
from django.urls import reverse_lazy
|
|
23 | 23 |
from django.db.models import Q, Prefetch |
24 | 24 |
from django.db.models.expressions import RawSQL |
25 | 25 |
from django.utils import six |
combo/apps/lingo/models.py | ||
---|---|---|
34 | 34 |
from django.utils.translation import ugettext_lazy as _ |
35 | 35 |
from django.utils import timezone, dateparse, six |
36 | 36 |
from django.core.mail import EmailMultiAlternatives |
37 |
from django.core.urlresolvers import reverse
|
|
37 |
from django.urls import reverse
|
|
38 | 38 |
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied |
39 | 39 |
from django.utils.encoding import python_2_unicode_compatible |
40 | 40 |
from django.utils.formats import localize |
combo/apps/lingo/views.py | ||
---|---|---|
22 | 22 | |
23 | 23 |
from django.contrib.auth.models import User |
24 | 24 |
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied |
25 |
from django.core.urlresolvers import reverse
|
|
25 |
from django.urls import reverse
|
|
26 | 26 |
from django.core import signing |
27 | 27 |
from django.http import HttpResponse, HttpResponseNotFound, HttpResponseRedirect, HttpResponseBadRequest |
28 | 28 |
from django.http import HttpResponseForbidden, Http404, JsonResponse |
combo/apps/maps/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.utils.translation import ugettext_lazy as _ |
20 | 20 | |
21 | 21 |
combo/apps/maps/manager_views.py | ||
---|---|---|
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 |
from django.core.urlresolvers import reverse, reverse_lazy
|
|
17 |
from django.urls import reverse, reverse_lazy
|
|
18 | 18 |
from django.http import Http404 |
19 | 19 |
from django.shortcuts import get_object_or_404 |
20 | 20 |
from django.utils.translation import ugettext_lazy as _ |
combo/apps/maps/models.py | ||
---|---|---|
24 | 24 |
from django.utils.html import escape |
25 | 25 |
from django.utils.text import slugify |
26 | 26 |
from django.utils.translation import ugettext_lazy as _ |
27 |
from django.core.urlresolvers import reverse_lazy
|
|
27 |
from django.urls import reverse_lazy
|
|
28 | 28 |
from django import forms |
29 | 29 |
from django.conf import settings |
30 | 30 |
combo/apps/pwa/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.utils.translation import ugettext_lazy as _ |
20 | 20 | |
21 | 21 |
combo/apps/pwa/manager_views.py | ||
---|---|---|
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 |
from django.core.urlresolvers import reverse_lazy
|
|
17 |
from django.urls import reverse_lazy
|
|
18 | 18 |
from django.db.models import Max |
19 | 19 |
from django import forms |
20 | 20 |
from django.http import JsonResponse |
combo/apps/search/__init__.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
import django.apps |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.utils.translation import ugettext_lazy as _ |
20 | 20 | |
21 | 21 |
from .engines import engines |
combo/apps/wcs/__init__.py | ||
---|---|---|
18 | 18 | |
19 | 19 |
import django.apps |
20 | 20 |
from django.conf import settings |
21 |
from django.core.urlresolvers import reverse
|
|
21 |
from django.urls import reverse
|
|
22 | 22 |
from django.utils.encoding import force_bytes |
23 | 23 |
from django.utils.translation import ugettext_lazy as _, pgettext_lazy |
24 | 24 |
combo/apps/wcs/views.py | ||
---|---|---|
19 | 19 |
from django.contrib import messages |
20 | 20 |
from django.conf import settings |
21 | 21 |
from django.core.exceptions import DisallowedRedirect, PermissionDenied |
22 |
from django.core.urlresolvers import reverse
|
|
22 |
from django.urls import reverse
|
|
23 | 23 |
from django.http import JsonResponse, HttpResponseRedirect, HttpResponseBadRequest |
24 | 24 |
from django.utils.http import urlquote |
25 | 25 |
from django.utils.six.moves.urllib import parse as urlparse |
combo/manager/templatetags/cells.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
from django import template |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 | |
20 | 20 |
register = template.Library() |
21 | 21 |
combo/manager/views.py | ||
---|---|---|
22 | 22 |
from django.conf import settings |
23 | 23 |
from django.contrib import messages |
24 | 24 |
from django.core.exceptions import ObjectDoesNotExist, PermissionDenied |
25 |
from django.core.urlresolvers import reverse, reverse_lazy
|
|
25 |
from django.urls import reverse, reverse_lazy
|
|
26 | 26 |
from django.http import HttpResponse, HttpResponseRedirect, Http404 |
27 | 27 |
from django.shortcuts import redirect |
28 | 28 |
from django.shortcuts import render |
combo/monkeypatch.py | ||
---|---|---|
14 | 14 |
# You should have received a copy of the GNU Affero General Public License |
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 |
from django.core.urlresolvers import reverse
|
|
17 |
from django.urls import reverse
|
|
18 | 18 |
from django.forms.utils import flatatt |
19 | 19 |
from django.template.loader import render_to_string |
20 | 20 |
from django.utils.encoding import force_text |
combo/public/admin.py | ||
---|---|---|
15 | 15 |
# along with this program. If not, see <http://www.gnu.org/licenses/>. |
16 | 16 | |
17 | 17 |
from django.contrib import admin |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.shortcuts import redirect |
20 | 20 |
from django.urls.exceptions import NoReverseMatch |
21 | 21 |
from django.views.decorators.cache import never_cache |
combo/urls_utils.py | ||
---|---|---|
18 | 18 | |
19 | 19 |
from django.contrib.auth.decorators import user_passes_test |
20 | 20 |
from django.core.exceptions import PermissionDenied |
21 |
from django.core.urlresolvers import RegexURLPattern, RegexURLResolver
|
|
21 |
from django.urls import RegexURLPattern, RegexURLResolver
|
|
22 | 22 | |
23 | 23 |
class DecoratedURLPattern(RegexURLPattern): |
24 | 24 |
def resolve(self, *args, **kwargs): |
tests/test_assets.py | ||
---|---|---|
2 | 2 | |
3 | 3 |
import base64 |
4 | 4 | |
5 |
from django.core.urlresolvers import reverse
|
|
5 |
from django.urls import reverse
|
|
6 | 6 | |
7 | 7 |
import pytest |
8 | 8 |
tests/test_calendar.py | ||
---|---|---|
6 | 6 | |
7 | 7 |
from django.contrib.auth.models import User |
8 | 8 |
from django.core.cache import cache |
9 |
from django.core.urlresolvers import reverse
|
|
9 |
from django.urls import reverse
|
|
10 | 10 |
from django.utils.six.moves.urllib import parse as urlparse |
11 | 11 | |
12 | 12 |
from combo.data.models import Page |
tests/test_cells.py | ||
---|---|---|
18 | 18 |
from django.test.client import RequestFactory |
19 | 19 |
from django.test.utils import CaptureQueriesContext |
20 | 20 |
from django.contrib.auth.models import User |
21 |
from django.core.urlresolvers import reverse
|
|
21 |
from django.urls import reverse
|
|
22 | 22 |
from django.utils.encoding import force_text, force_bytes |
23 | 23 |
from django.utils.timezone import now |
24 | 24 |
tests/test_dashboard.py | ||
---|---|---|
9 | 9 |
from django.conf import settings |
10 | 10 |
from django.contrib.auth.models import User |
11 | 11 |
from django.core.management import call_command |
12 |
from django.core.urlresolvers import reverse
|
|
12 |
from django.urls import reverse
|
|
13 | 13 |
from django.utils.six.moves.urllib import parse as urlparse |
14 | 14 |
from django.test import override_settings |
15 | 15 |
tests/test_gallery_cell.py | ||
---|---|---|
2 | 2 |
import os |
3 | 3 |
import pytest |
4 | 4 | |
5 |
from django.core.urlresolvers import reverse
|
|
5 |
from django.urls import reverse
|
|
6 | 6 |
from combo.data.models import Page |
7 | 7 |
from combo.apps.gallery.models import GalleryCell, Image |
8 | 8 |
tests/test_lingo_payment.py | ||
---|---|---|
9 | 9 | |
10 | 10 |
from django.apps import apps |
11 | 11 |
from django.contrib.auth.models import User |
12 |
from django.core.urlresolvers import reverse
|
|
12 |
from django.urls import reverse
|
|
13 | 13 |
from django.core.wsgi import get_wsgi_application |
14 | 14 |
from django.conf import settings |
15 | 15 |
from django.test import override_settings |
tests/test_lingo_remote_regie.py | ||
---|---|---|
10 | 10 |
from django.apps import apps |
11 | 11 |
from django.test.client import RequestFactory |
12 | 12 |
from django.test import override_settings |
13 |
from django.core.urlresolvers import reverse
|
|
13 |
from django.urls import reverse
|
|
14 | 14 |
from django.conf import settings |
15 | 15 |
from django.core.management import call_command |
16 | 16 |
from django.utils.encoding import force_text |
tests/test_manager.py | ||
---|---|---|
7 | 7 |
import mock |
8 | 8 | |
9 | 9 |
from django.core.files.storage import default_storage |
10 |
from django.core.urlresolvers import reverse
|
|
10 |
from django.urls import reverse
|
|
11 | 11 |
from django.conf import settings |
12 | 12 |
from django.contrib.auth.models import User, Group |
13 | 13 |
from django.db import connection |
tests/test_maps_cells.py | ||
---|---|---|
6 | 6 |
from django.conf import settings |
7 | 7 |
from django.contrib.auth.models import User |
8 | 8 |
from django.contrib.auth.models import Group |
9 |
from django.core.urlresolvers import reverse
|
|
9 |
from django.urls import reverse
|
|
10 | 10 |
from django.test.client import RequestFactory |
11 | 11 |
from django.utils.html import escape |
12 | 12 |
tests/test_notification.py | ||
---|---|---|
9 | 9 |
from django.test.client import RequestFactory |
10 | 10 |
from django.utils.encoding import force_text |
11 | 11 |
from django.utils.timezone import timedelta, now |
12 |
from django.core.urlresolvers import reverse
|
|
12 |
from django.urls import reverse
|
|
13 | 13 | |
14 | 14 |
from django.test import Client |
15 | 15 |
tests/test_public.py | ||
---|---|---|
9 | 9 | |
10 | 10 |
from django.conf import settings |
11 | 11 |
from django.contrib.auth.models import User, Group |
12 |
from django.core.urlresolvers import reverse
|
|
12 |
from django.urls import reverse
|
|
13 | 13 |
from django.db import connection |
14 | 14 |
from django.utils.http import quote |
15 | 15 |
from django.utils import six |
tests/test_pwa.py | ||
---|---|---|
9 | 9 | |
10 | 10 |
from django.conf import settings |
11 | 11 |
from django.core.files import File |
12 |
from django.core.urlresolvers import reverse
|
|
12 |
from django.urls import reverse
|
|
13 | 13 |
from django.template import Context, Template |
14 | 14 |
from django.test import override_settings |
15 | 15 |
from django.test.client import RequestFactory |
tests/test_search.py | ||
---|---|---|
12 | 12 |
from django.test.client import RequestFactory |
13 | 13 |
from django.test.utils import CaptureQueriesContext |
14 | 14 |
from django.core.management import call_command |
15 |
from django.core.urlresolvers import reverse
|
|
15 |
from django.urls import reverse
|
|
16 | 16 | |
17 | 17 |
from combo.apps.search.engines import engines |
18 | 18 |
from combo.apps.search.models import SearchCell, IndexedCell |
tests/test_wcs.py | ||
---|---|---|
15 | 15 |
from django.apps import apps |
16 | 16 |
from django.conf import settings |
17 | 17 |
from django.core.cache import cache |
18 |
from django.core.urlresolvers import reverse
|
|
18 |
from django.urls import reverse
|
|
19 | 19 |
from django.db import connection |
20 | 20 |
from django.test import override_settings |
21 | 21 |
from django.test.client import RequestFactory |
22 |
- |