diff --git a/gracedb/api/v1/main/views.py b/gracedb/api/v1/main/views.py index 9164e7fa2bc37a42fcfc231abd7683a0c6ec3248..b1bb7420ff3e7bdad005d9d29889b4527d8bd0f2 100644 --- a/gracedb/api/v1/main/views.py +++ b/gracedb/api/v1/main/views.py @@ -192,13 +192,13 @@ class UserInfoView(RetrieveAPIView): #def get_serializer_class(self): # # Override so we can use custom behavior for unauthenticated users - # if self.request.user.is_anonymous(): + # if self.request.user.is_anonymous: # return AnonymousUserSerializer # else: # return self.serializer_class def retrieve(self, request, *args, **kwargs): - if request.user.is_anonymous(): + if request.user.is_anonymous: output = {'username': 'AnonymousUser'} else: instance = request.user diff --git a/gracedb/core/models.py b/gracedb/core/models.py index d291978ec6a4ef670dbe9776584d98d308c28a3c..b3f36fb00ddff9cdcb694e81f41e6d88f079dd6a 100644 --- a/gracedb/core/models.py +++ b/gracedb/core/models.py @@ -109,7 +109,7 @@ class AutoIncrementModel(models.Model): query = models.sql.InsertQuery(self.__class__) query.insert_values(fields, objs=[self]) compiler = query.get_compiler(using=self.__class__._base_manager.db) - compiler.return_id = meta.has_auto_field and not pk_set + compiler.return_id = meta.auto_field is not None and not pk_set # Useful function qn = compiler.quote_name_unless_alias diff --git a/gracedb/events/reports.py b/gracedb/events/reports.py index aeaa82f0fec37c04b715b6355f63c478ca03cf6e..4edb249792e7cc84befb3bf5cb633fe2177f806c 100644 --- a/gracedb/events/reports.py +++ b/gracedb/events/reports.py @@ -131,7 +131,7 @@ def to_png_image(out = sys.stdout): @internal_user_required def cbc_report(request, format=""): - if not request.user or not request.user.is_authenticated(): + if not request.user or not request.user.is_authenticated: return HttpResponseForbidden("Forbidden") if request.method == "GET":