diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-05-18 16:23:02 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:20:58 +0100 |
commit | e046ed00e790fbb82b43de9404d8ca3955c8de2f (patch) | |
tree | 7e3ea0f3306eea50e9f95a7c90b397c5515e97fb /ishtar_common/utils.py | |
parent | eec69099f0c6dfdcef5acc15d57dadc7cd04813b (diff) | |
download | Ishtar-e046ed00e790fbb82b43de9404d8ca3955c8de2f.tar.bz2 Ishtar-e046ed00e790fbb82b43de9404d8ca3955c8de2f.zip |
Migration to Django 2.2 - many fixes
- remove redondant permissions
- fix missing kwargs for widget and form fields
- fix default to callable for model field
- quick and dirty fix for datepicker
- is_authenticated() -> is_authenticated
- fix registration urls
- remove six usage (no more python2)
Diffstat (limited to 'ishtar_common/utils.py')
-rw-r--r-- | ishtar_common/utils.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index cbf4242b2..3a349c04b 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -33,7 +33,6 @@ import re import requests from secretary import Renderer as MainSecretaryRenderer, UndefinedSilently import shutil -import six import subprocess import sys import tempfile @@ -227,7 +226,7 @@ def check_model_access_control(request, model, available_perms=None): """ own = True # more restrictive by default allowed = False - if not request.user.is_authenticated(): + if not request.user.is_authenticated: return allowed, own if not available_perms: @@ -1797,7 +1796,7 @@ def get_all_media(exclude=None, debug=False): exclude = [] media = set() - full_dirs = list(os.walk(six.text_type(settings.MEDIA_ROOT))) + full_dirs = list(os.walk(settings.MEDIA_ROOT)) ln_full = len(full_dirs) for idx_main, full_dir in enumerate(full_dirs): root, dirs, files = full_dir |