encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 01:26:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Update Django Guardian dependency. (#6430)

Browse Source 
* Update Django Guardian dependency.
* Skip testing Guardian on PY2. See https://github.com/django-guardian/django-guardian/issues/602
This commit is contained in:
Carlton Gibson 2019-01-31 15:59:19 +01:00 committed by GitHub
parent bd9a799e16
commit 190f6201cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
requirements/requirements-optionals.txt
View File

@ -1,7 +1,7 @@
# Optional packages which may be used with REST framework. # Optional packages which may be used with REST framework.
psycopg2-binary==2.7.5 psycopg2-binary==2.7.5
markdown==2.6.11 markdown==2.6.11
django-guardian==1.4.9 django-guardian==1.5.0
django-filter==1.1.0 django-filter==1.1.0
coreapi==2.3.1 coreapi==2.3.1
coreschema==0.0.4 coreschema==0.0.4

4
rest_framework/compat.py
View File

@ -161,6 +161,10 @@ def is_guardian_installed():
""" """
django-guardian is optional and only imported if in INSTALLED_APPS. django-guardian is optional and only imported if in INSTALLED_APPS.
""" """
if six.PY2:
# Guardian 1.5.0, for Django 2.2 is NOT compatible with Python 2.7.
# Remove when dropping PY2.
return False
return 'guardian' in settings.INSTALLED_APPS return 'guardian' in settings.INSTALLED_APPS