From b954695d89e22f684330e3481bbfef0ef4feb7f1 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Sat, 19 Jan 2019 10:50:10 +0100 Subject: [PATCH] compat: support pre 1.0 django-jsonfield (fixes #29917) --- src/authentic2/compat.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/authentic2/compat.py b/src/authentic2/compat.py index fe9dc665..1e1b745a 100644 --- a/src/authentic2/compat.py +++ b/src/authentic2/compat.py @@ -102,14 +102,15 @@ class JSONField(object): try: - from jsonfield import fields + import jsonfield.fields except ImportError: pass else: # prevent django-jsonfield from modifying postgresql connection when we are # not using it - def configure_database_connection(connection, **kwargs): - if django.VERSION < (1, 11): - fields.configure_database_connection(connection, **kwargs) - fields.connection_created.disconnect(fields.configure_database_connection) - fields.connection_created.connect(configure_database_connection) + if hasattr(jsonfield.fields, 'connection_created'): + def configure_database_connection(connection, **kwargs): + if django.VERSION < (1, 11): + jsonfield.fields.configure_database_connection(connection, **kwargs) + jsonfield.fields.connection_created.disconnect(jsonfield.fields.configure_database_connection) + jsonfield.fields.connection_created.connect(configure_database_connection) -- 2.20.1