Merge pull request #713 from kobotoolbox/kc2.0-punch-list

Python3 and Django2.2 upgrade punch list items

onadata/apps/api/urls.py

@@ -39,7 +39,6 @@ def __init__(self, *args, **kwargs):
         # Dynamically generated routes.
         # Generated using @action or @link decorators on methods of the viewset
 
-        # FIXME find out with what value `detail` should be set
         self.lookups_routes.append(routers.Route(
             url=[
                 r'^{prefix}/{lookups}/{methodname}{trailing_slash}$',

onadata/apps/main/views.py

@@ -63,8 +63,7 @@ def profile(request, username):
             "/%s" % request.user.username)
         url = request_url.replace('http://', 'https://')
         xforms = XForm.objects.filter(user=content_user)\
-            .select_related('user')\
-            .prefetch_related('instances')
+            .select_related('user', 'instances')
 
         user_xforms = xforms
         # forms shared with user

onadata/libs/serializers/note_serializer.py

@@ -8,8 +8,6 @@
 
 class NoteSerializer(serializers.ModelSerializer):
 
-    # ToDo Verify why calling this here?
-    serializers.ModelSerializer()
     instance = serializers.PrimaryKeyRelatedField(queryset=Instance.objects.all())
 
     class Meta: