diff --git a/djing/lib/decorators.py b/djing/lib/decorators.py index cbdf61f..d903cd8 100644 --- a/djing/lib/decorators.py +++ b/djing/lib/decorators.py @@ -99,7 +99,9 @@ def json_view(fn): @wraps(fn) def wrapped(request, *args, **kwargs): r = fn(request, *args, **kwargs) - return JsonResponse(r, safe=False, json_dumps_params={ + if not isinstance(r['text'], str): + r['text'] = str(r['text']) + return JsonResponse(dict(r), safe=False, json_dumps_params={ 'ensure_ascii': False }) return wrapped diff --git a/gw_app/nas_managers/core.py b/gw_app/nas_managers/core.py index d50e9d2..9eb08f2 100644 --- a/gw_app/nas_managers/core.py +++ b/gw_app/nas_managers/core.py @@ -1,4 +1,4 @@ -from abc import ABC, abstractmethod, abstractproperty +from abc import ABC, abstractmethod from typing import Iterator, Tuple, Optional from djing import ping from gw_app.nas_managers.structs import SubnetQueue, VectorQueue @@ -16,7 +16,8 @@ class NasNetworkError(Exception): # Communicate with gw class BaseTransmitter(ABC): - @abstractproperty + @property + @abstractmethod def description(self): """ :return: Returnd a description of nas implementation