Skip to content

Commit df711ac

Browse files
committed
Changes for Django 4
1 parent a206134 commit df711ac

File tree

3 files changed

+15
-13
lines changed

3 files changed

+15
-13
lines changed

crudbuilder/signals.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
from django.dispatch import Signal
22

33
# post save signals for single model instance
4-
post_create_signal = Signal(providing_args=['request', 'instance'])
5-
post_update_signal = Signal(providing_args=['request', 'instance'])
4+
post_create_signal = Signal()
5+
post_update_signal = Signal()
66

77
# post save signals for inline formset
8-
post_inline_create_signal = Signal(providing_args=['request', 'parent', 'children'])
9-
post_inline_update_signal = Signal(providing_args=['request', 'parent', 'children'])
8+
post_inline_create_signal = Signal()
9+
post_inline_update_signal = Signal()
1010

1111

1212
crudbuilder_signals = {

crudbuilder/templatetags/crudbuilder.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
from django.template.defaultfilters import stringfilter
66
from collections import namedtuple
77

8-
try:
9-
from django.utils.encoding import force_text
10-
except ImportError:
11-
from django.utils.encoding import force_unicode as force_text
8+
# try:
9+
# from django.utils.encoding import force_str
10+
# except ImportError:
11+
# from django.utils.encoding import force_unicode as force_str
12+
from django.utils.encoding import force_str
1213

1314
register = template.Library()
1415
Field = namedtuple('Field', 'name verbose_name')
@@ -147,7 +148,7 @@ def get_pagination_context(page, pages_to_show=11,
147148
# Append proper character to url
148149
if url:
149150
# Remove existing page GET parameters
150-
url = force_text(url)
151+
url = force_str(url)
151152
url = re.sub(r'\?{0}\=[^\&]+'.format(parameter_name), '?', url)
152153
url = re.sub(r'\&{0}\=[^\&]+'.format(parameter_name), '', url)
153154
# Append proper separator
@@ -159,7 +160,7 @@ def get_pagination_context(page, pages_to_show=11,
159160
if extra:
160161
if not url:
161162
url = '?'
162-
url += force_text(extra) + '&'
163+
url += force_str(extra) + '&'
163164
if url:
164165
url = url.replace('?&', '?')
165166
# Set CSS classes, see http://getbootstrap.com/components/#pagination

crudbuilder/urls.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11

2-
from django.conf.urls import url
2+
from django.urls import re_path
33
from django.db import connection
4+
from django.urls import path
45

56
from crudbuilder.registry import registry
67
from crudbuilder.views import ViewBuilder, crudlist_view
78
from crudbuilder import helpers
89
helpers.auto_discover()
910

1011
urlpatterns = [
11-
url(r'^$', crudlist_view, name='crud-index'),
12+
re_path(r'^$', crudlist_view, name='crud-index'),
1213
]
1314

1415
tables = connection.introspection.table_names()
@@ -44,6 +45,6 @@
4445
url_name = entry[2].format(app, postfix_url)
4546

4647
urls.append(
47-
url(address, entry[1], name=url_name),
48+
re_path(address, entry[1], name=url_name),
4849
)
4950
urlpatterns += urls

0 commit comments

Comments
 (0)