From a97a91aeab1e272da53e1ea3247f80c3f4d4c664 Mon Sep 17 00:00:00 2001
From: Olivier Leger <olivierleger@gmail.com>
Date: Thu, 16 Jul 2020 14:42:05 -0400
Subject: [PATCH] Removed useless object inheritance in Python3

---
 onadata/apps/api/mongo_helper.py                         | 2 +-
 onadata/apps/api/permissions.py                          | 2 +-
 onadata/apps/logger/factory.py                           | 2 +-
 onadata/apps/logger/tests/test_simple_submission.py      | 2 +-
 onadata/apps/logger/xform_fs.py                          | 2 +-
 onadata/apps/logger/xform_instance_parser.py             | 2 +-
 onadata/apps/main/google_doc.py                          | 2 +-
 onadata/apps/main/models/audit.py                        | 2 +-
 onadata/apps/restservice/RestServiceInterface.py         | 2 +-
 onadata/apps/viewer/pandas_mongo_bridge.py               | 6 +++---
 onadata/apps/viewer/xls_writer.py                        | 2 +-
 onadata/libs/filters.py                                  | 2 +-
 onadata/libs/mixins/anonymous_user_mixin.py              | 2 +-
 onadata/libs/mixins/anonymous_user_public_forms_mixin.py | 2 +-
 onadata/libs/mixins/labels_mixin.py                      | 2 +-
 onadata/libs/mixins/multi_lookup_mixin.py                | 2 +-
 onadata/libs/mixins/object_lookup_mixin.py               | 2 +-
 onadata/libs/mixins/openrosa_headers_mixin.py            | 2 +-
 onadata/libs/mixins/view_permission_mixin.py             | 2 +-
 onadata/libs/mixins/xform_id_string_lookup.py            | 2 +-
 onadata/libs/models/clone_xform.py                       | 2 +-
 onadata/libs/serializers/password_reset_serializer.py    | 4 ++--
 onadata/libs/templates/rest_framework_swagger/index.html | 2 +-
 onadata/libs/utils/briefcase_client.py                   | 4 ++--
 onadata/libs/utils/csv_reader.py                         | 2 +-
 onadata/libs/utils/export_tools.py                       | 4 ++--
 onadata/libs/utils/log.py                                | 2 +-
 onadata/libs/utils/redis_helper.py                       | 2 +-
 28 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/onadata/apps/api/mongo_helper.py b/onadata/apps/api/mongo_helper.py
index 488dc778c..6b14e3392 100644
--- a/onadata/apps/api/mongo_helper.py
+++ b/onadata/apps/api/mongo_helper.py
@@ -5,7 +5,7 @@
 from onadata.libs.utils.string import base64_encodestring
 
 
-class MongoHelper(object):
+class MongoHelper:
 
     KEY_WHITELIST = ['$or', '$and', '$exists', '$in', '$gt', '$gte',
                      '$lt', '$lte', '$regex', '$options', '$all']
diff --git a/onadata/apps/api/permissions.py b/onadata/apps/api/permissions.py
index 3ec6bc341..30a8001e8 100644
--- a/onadata/apps/api/permissions.py
+++ b/onadata/apps/api/permissions.py
@@ -109,7 +109,7 @@ def has_object_permission(self, request, view, obj):
             request, view, obj)
 
 
-class HasXFormObjectPermissionMixin(object):
+class HasXFormObjectPermissionMixin:
     """Use XForm permissions for Attachment objects"""
     def has_permission(self, request, view):
         model_cls = None
diff --git a/onadata/apps/logger/factory.py b/onadata/apps/logger/factory.py
index d061b48fe..b1b2297b3 100644
--- a/onadata/apps/logger/factory.py
+++ b/onadata/apps/logger/factory.py
@@ -74,7 +74,7 @@ def _load_simple_survey_object():
     return survey
 
 
-class XFormManagerFactory(object):
+class XFormManagerFactory:
 
     def create_registration_xform(self):
         """
diff --git a/onadata/apps/logger/tests/test_simple_submission.py b/onadata/apps/logger/tests/test_simple_submission.py
index deba4e395..ae875f10f 100644
--- a/onadata/apps/logger/tests/test_simple_submission.py
+++ b/onadata/apps/logger/tests/test_simple_submission.py
@@ -10,7 +10,7 @@
 )
 
 
-class TempFileProxy(object):
+class TempFileProxy:
     """
     create_instance will be looking for a file object,
     with "read" and "close" methods.
diff --git a/onadata/apps/logger/xform_fs.py b/onadata/apps/logger/xform_fs.py
index be6bf43a6..503652f90 100644
--- a/onadata/apps/logger/xform_fs.py
+++ b/onadata/apps/logger/xform_fs.py
@@ -4,7 +4,7 @@
 import re
 
 
-class XFormInstanceFS(object):
+class XFormInstanceFS:
     def __init__(self, filepath):
         self.path = filepath
         self.directory, self.filename = os.path.split(self.path)
diff --git a/onadata/apps/logger/xform_instance_parser.py b/onadata/apps/logger/xform_instance_parser.py
index 8c04708f1..f65f668ee 100644
--- a/onadata/apps/logger/xform_instance_parser.py
+++ b/onadata/apps/logger/xform_instance_parser.py
@@ -271,7 +271,7 @@ def _get_all_attributes(node):
             yield pair
 
 
-class XFormInstanceParser(object):
+class XFormInstanceParser:
 
     def __init__(self, xml_str, data_dictionary):
         self.dd = data_dictionary
diff --git a/onadata/apps/main/google_doc.py b/onadata/apps/main/google_doc.py
index 4a02d92d2..5d1e5c34b 100644
--- a/onadata/apps/main/google_doc.py
+++ b/onadata/apps/main/google_doc.py
@@ -44,7 +44,7 @@ def add_child(self, value):
         return child
 
 
-class GoogleDoc(object):
+class GoogleDoc:
     """
     This class provides a structure for dealing with a Google
     Document. Most use cases will initialize a GoogleDoc by passing a
diff --git a/onadata/apps/main/models/audit.py b/onadata/apps/main/models/audit.py
index 9430d5582..3b23aba41 100644
--- a/onadata/apps/main/models/audit.py
+++ b/onadata/apps/main/models/audit.py
@@ -11,7 +11,7 @@
 DEFAULT_LIMIT = 1000
 
 
-class AuditLog(object):
+class AuditLog:
     ACCOUNT = "account"
     DEFAULT_BATCHSIZE = 1000
     CREATED_ON = "created_on"
diff --git a/onadata/apps/restservice/RestServiceInterface.py b/onadata/apps/restservice/RestServiceInterface.py
index e3cbaef69..28495d5a5 100644
--- a/onadata/apps/restservice/RestServiceInterface.py
+++ b/onadata/apps/restservice/RestServiceInterface.py
@@ -1,4 +1,4 @@
 # coding: utf-8
-class RestServiceInterface(object):
+class RestServiceInterface:
     def send(self, url, data=None):
         raise NotImplementedError
diff --git a/onadata/apps/viewer/pandas_mongo_bridge.py b/onadata/apps/viewer/pandas_mongo_bridge.py
index 2788f2794..1dee365d2 100644
--- a/onadata/apps/viewer/pandas_mongo_bridge.py
+++ b/onadata/apps/viewer/pandas_mongo_bridge.py
@@ -87,7 +87,7 @@ def get_prefix_from_xpath(xpath):
             '%s cannot be prefixed, it returns %s' % (xpath, str(parts)))
 
 
-class AbstractDataFrameBuilder(object):
+class AbstractDataFrameBuilder:
     IGNORED_COLUMNS = [XFORM_ID_STRING, STATUS, ID, ATTACHMENTS, GEOLOCATION,
                        DELETEDAT, SUBMITTED_BY]
     # fields NOT within the form def that we want to include
@@ -675,7 +675,7 @@ def export_to(self, file_or_path, data_frame_max_size=30000):
             csv_file.close()
 
 
-class XLSDataFrameWriter(object):
+class XLSDataFrameWriter:
     def __init__(self, records, columns):
         self.dataframe = DataFrame(records, columns=columns)
 
@@ -685,7 +685,7 @@ def write_to_excel(self, excel_writer, sheet_name, header=False,
                                 index=index)
 
 
-class CSVDataFrameWriter(object):
+class CSVDataFrameWriter:
     def __init__(self, records, columns):
         # TODO: if records is empty, raise a known exception
         # catch it in the view and handle
diff --git a/onadata/apps/viewer/xls_writer.py b/onadata/apps/viewer/xls_writer.py
index 27579a752..a8ef535ac 100644
--- a/onadata/apps/viewer/xls_writer.py
+++ b/onadata/apps/viewer/xls_writer.py
@@ -8,7 +8,7 @@
 from onadata.libs.utils.export_tools import question_types_to_exclude
 
 
-class XlsWriter(object):
+class XlsWriter:
 
     def __init__(self):
         self.set_file()
diff --git a/onadata/libs/filters.py b/onadata/libs/filters.py
index d78f99b62..d7c03e46e 100644
--- a/onadata/libs/filters.py
+++ b/onadata/libs/filters.py
@@ -61,7 +61,7 @@ def filter_queryset(self, request, queryset, view):
         return queryset
 
 
-class XFormPermissionFilterMixin(object):
+class XFormPermissionFilterMixin:
 
     def _xform_filter_queryset(self, request, queryset, view, keyword):
         """Use XForm permissions"""
diff --git a/onadata/libs/mixins/anonymous_user_mixin.py b/onadata/libs/mixins/anonymous_user_mixin.py
index 8fa03f6cc..e5693c7ed 100644
--- a/onadata/libs/mixins/anonymous_user_mixin.py
+++ b/onadata/libs/mixins/anonymous_user_mixin.py
@@ -4,7 +4,7 @@
 from django.shortcuts import get_object_or_404
 
 
-class AnonymousUserMixin(object):
+class AnonymousUserMixin:
 
     def get_queryset(self):
         """
diff --git a/onadata/libs/mixins/anonymous_user_public_forms_mixin.py b/onadata/libs/mixins/anonymous_user_public_forms_mixin.py
index 4f7ee80a4..27f18ee1a 100644
--- a/onadata/libs/mixins/anonymous_user_public_forms_mixin.py
+++ b/onadata/libs/mixins/anonymous_user_public_forms_mixin.py
@@ -2,7 +2,7 @@
 from onadata.apps.logger.models.xform import XForm
 
 
-class AnonymousUserPublicFormsMixin(object):
+class AnonymousUserPublicFormsMixin:
 
     def _get_public_forms_queryset(self):
         return XForm.objects.filter(shared=True)
diff --git a/onadata/libs/mixins/labels_mixin.py b/onadata/libs/mixins/labels_mixin.py
index 90695d02f..e940e6a8e 100644
--- a/onadata/libs/mixins/labels_mixin.py
+++ b/onadata/libs/mixins/labels_mixin.py
@@ -81,7 +81,7 @@ def process_label_request(request, label, instance):
     return Response(data, status=http_status)
 
 
-class LabelsMixin(object):
+class LabelsMixin:
     @action(detail=True, methods=['GET', 'POST', 'DELETE'], extra_lookup_fields=['label', ])
     def labels(self, request, format='json', **kwargs):
         xform = self.get_object()
diff --git a/onadata/libs/mixins/multi_lookup_mixin.py b/onadata/libs/mixins/multi_lookup_mixin.py
index abd967a22..8b11fc46b 100644
--- a/onadata/libs/mixins/multi_lookup_mixin.py
+++ b/onadata/libs/mixins/multi_lookup_mixin.py
@@ -4,7 +4,7 @@
 from rest_framework.exceptions import ParseError
 
 
-class MultiLookupMixin(object):
+class MultiLookupMixin:
     def get_object(self):
         queryset = self.filter_queryset(self.get_queryset())
         filter_kwargs = {}
diff --git a/onadata/libs/mixins/object_lookup_mixin.py b/onadata/libs/mixins/object_lookup_mixin.py
index 3b6f0b25b..63eaa5508 100644
--- a/onadata/libs/mixins/object_lookup_mixin.py
+++ b/onadata/libs/mixins/object_lookup_mixin.py
@@ -4,7 +4,7 @@
 from rest_framework.generics import get_object_or_404
 
 
-class ObjectLookupMixin(object):
+class ObjectLookupMixin:
     def get_object(self):
         """
         Incase the lookup is on an object that has been hyperlinked
diff --git a/onadata/libs/mixins/openrosa_headers_mixin.py b/onadata/libs/mixins/openrosa_headers_mixin.py
index bb2e9ed85..0f8976767 100644
--- a/onadata/libs/mixins/openrosa_headers_mixin.py
+++ b/onadata/libs/mixins/openrosa_headers_mixin.py
@@ -8,7 +8,7 @@
 DEFAULT_CONTENT_LENGTH = getattr(settings, 'DEFAULT_CONTENT_LENGTH', 10000000)
 
 
-class OpenRosaHeadersMixin(object):
+class OpenRosaHeadersMixin:
     def get_openrosa_headers(self, request, location=True):
         tz = pytz.timezone(settings.TIME_ZONE)
         dt = datetime.now(tz).strftime('%a, %d %b %Y %H:%M:%S %Z')
diff --git a/onadata/libs/mixins/view_permission_mixin.py b/onadata/libs/mixins/view_permission_mixin.py
index f80bccaaa..f0792d0de 100644
--- a/onadata/libs/mixins/view_permission_mixin.py
+++ b/onadata/libs/mixins/view_permission_mixin.py
@@ -3,7 +3,7 @@
 from guardian.shortcuts import get_objects_for_user
 
 
-class ViewPermissionMixin(object):
+class ViewPermissionMixin:
 
     def get_queryset(self):
         """
diff --git a/onadata/libs/mixins/xform_id_string_lookup.py b/onadata/libs/mixins/xform_id_string_lookup.py
index 5a031597d..6421d5f0c 100644
--- a/onadata/libs/mixins/xform_id_string_lookup.py
+++ b/onadata/libs/mixins/xform_id_string_lookup.py
@@ -3,7 +3,7 @@
 from django.shortcuts import get_object_or_404
 
 
-class XFormIdStringLookupMixin(object):
+class XFormIdStringLookupMixin:
     lookup_id_string = 'id_string'
 
     def get_object(self):
diff --git a/onadata/libs/models/clone_xform.py b/onadata/libs/models/clone_xform.py
index f3eac44c4..036774be6 100644
--- a/onadata/libs/models/clone_xform.py
+++ b/onadata/libs/models/clone_xform.py
@@ -6,7 +6,7 @@
 from onadata.apps.logger.models.xform import XForm
 
 
-class CloneXForm(object):
+class CloneXForm:
     def __init__(self, xform, username):
         self.xform = xform
         self.username = username
diff --git a/onadata/libs/serializers/password_reset_serializer.py b/onadata/libs/serializers/password_reset_serializer.py
index 0ff728330..493cdff3a 100644
--- a/onadata/libs/serializers/password_reset_serializer.py
+++ b/onadata/libs/serializers/password_reset_serializer.py
@@ -51,7 +51,7 @@ def get_user_from_uid(uid):
     return user
 
 
-class PasswordResetChange(object):
+class PasswordResetChange:
     def __init__(self, uid, new_password, token):
         self.uid = uid
         self.new_password = new_password
@@ -64,7 +64,7 @@ def save(self):
             user.save()
 
 
-class PasswordReset(object):
+class PasswordReset:
     def __init__(self, email, reset_url):
         self.email = email
         self.reset_url = reset_url
diff --git a/onadata/libs/templates/rest_framework_swagger/index.html b/onadata/libs/templates/rest_framework_swagger/index.html
index c11679bdc..a12911d15 100644
--- a/onadata/libs/templates/rest_framework_swagger/index.html
+++ b/onadata/libs/templates/rest_framework_swagger/index.html
@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 <!DOCTYPE html>
 <html>
 <head>
diff --git a/onadata/libs/utils/briefcase_client.py b/onadata/libs/utils/briefcase_client.py
index ba4a3d868..12feec715 100644
--- a/onadata/libs/utils/briefcase_client.py
+++ b/onadata/libs/utils/briefcase_client.py
@@ -77,7 +77,7 @@ def node_value(node, tag_name):
     return tag.childNodes[0].nodeValue
 
 
-class BriefcaseClient(object):
+class BriefcaseClient:
     def __init__(self, url, username, password, user):
         self.url = url
         self.user = user
@@ -275,7 +275,7 @@ def download_instances(self, form_id, cursor=0, num_entries=100):
                 self.download_instances(form_id, cursor)
 
     def _upload_xform(self, path, file_name):
-        class PublishXForm(object):
+        class PublishXForm:
             def __init__(self, xml_file, user):
                 self.xml_file = xml_file
                 self.user = user
diff --git a/onadata/libs/utils/csv_reader.py b/onadata/libs/utils/csv_reader.py
index 4bd730d2d..b01d92399 100644
--- a/onadata/libs/utils/csv_reader.py
+++ b/onadata/libs/utils/csv_reader.py
@@ -4,7 +4,7 @@
 import csv
 
 
-class CsvReader(object):
+class CsvReader:
     """
     Typical usage:
 
diff --git a/onadata/libs/utils/export_tools.py b/onadata/libs/utils/export_tools.py
index a2dd0e885..848db3ac3 100644
--- a/onadata/libs/utils/export_tools.py
+++ b/onadata/libs/utils/export_tools.py
@@ -82,7 +82,7 @@ def question_types_to_exclude(_type):
     return _type in QUESTION_TYPES_TO_EXCLUDE
 
 
-class DictOrganizer(object):
+class DictOrganizer:
 
     def set_dict_iterator(self, dict_iterator):
         self._dict_iterator = dict_iterator
@@ -185,7 +185,7 @@ def dict_to_joined_export(data, index, indices, name):
     return output
 
 
-class ExportBuilder(object):
+class ExportBuilder:
     IGNORED_COLUMNS = [XFORM_ID_STRING, STATUS, ATTACHMENTS, GEOLOCATION,
                        DELETEDAT]
     # fields we export but are not within the form's structure
diff --git a/onadata/libs/utils/log.py b/onadata/libs/utils/log.py
index 6d04f3964..d3ea30153 100644
--- a/onadata/libs/utils/log.py
+++ b/onadata/libs/utils/log.py
@@ -4,7 +4,7 @@
 from onadata.libs.utils.viewer_tools import get_client_ip
 
 
-class Enum(object):
+class Enum:
     __name__ = "Enum"
 
     def __init__(self, **enums):
diff --git a/onadata/libs/utils/redis_helper.py b/onadata/libs/utils/redis_helper.py
index 84e2db15c..c6d5fe6a6 100644
--- a/onadata/libs/utils/redis_helper.py
+++ b/onadata/libs/utils/redis_helper.py
@@ -5,7 +5,7 @@
 from django.utils.six.moves.urllib.parse import unquote_plus
 
 
-class RedisHelper(object):
+class RedisHelper:
     """
     Redis's helper.