Fix linting issues

Author: kofrezo

adminapi/dataset.py

@@ -8,10 +8,10 @@
 from types import GeneratorType
 
 from adminapi import api
-from adminapi.datatype import validate_value, json_to_datatype
+from adminapi.datatype import json_to_datatype, validate_value
+from adminapi.exceptions import AdminapiException, DatasetError
 from adminapi.filters import Any, BaseFilter, ContainedOnlyBy
-from adminapi.request import send_request, json_encode_extra
-from adminapi.exceptions import DatasetError, AdminapiException
+from adminapi.request import json_encode_extra, send_request
 
 NEW_OBJECT_ENDPOINT = '/dataset/new_object'
 COMMIT_ENDPOINT = '/dataset/commit'

adminapi/datatype.py

@@ -86,19 +86,19 @@ def validate_value(value, datatype=None):
         type(None),
     )
     assert datatype not in special_datatypes
-    if isinstance(value, special_datatypes):
+    if type(value) is object:
         raise DatatypeError('Value cannot be from {}'.format(type(value)))
 
-    assert datatype != object
-    if type(value) == object:
+    assert datatype is not object
+    if isinstance(value, object):
         raise DatatypeError('Value cannot be a generic object')
 
     newtype = type(value)
     if datatype is None or issubclass(datatype, newtype):
         return newtype
 
     for supertype in datatype.mro():
-        if issubclass(newtype, supertype) and supertype != object:
+        if issubclass(newtype, supertype) and supertype is not object:
             return supertype
 
     raise DatatypeError('Value from {} is not compatible with existing value from {}'.format(type(value), datatype))

adminapi/filters.py

@@ -12,11 +12,8 @@
 
 class BaseFilter(object):
     def __init__(self, value):
-        if type(self) == BaseFilter and isinstance(value, bool):
-            pass
-        elif isinstance(value, (int, float)):
-            pass
-        elif isinstance(value, tuple(s[0] for s in STR_BASED_DATATYPES)):
+        ok_datatypes = tuple([bool, int, float] + [s[0] for s in STR_BASED_DATATYPES])
+        if type(self) is BaseFilter and isinstance(value, ok_datatypes):
             pass
         elif isinstance(value, str):
             for char in '\'"':
@@ -34,12 +31,12 @@ def __or__(self, other):
         return Any(self, other)
 
     def __repr__(self):
-        if type(self) == BaseFilter:
+        if type(self) is BaseFilter:
             return repr(self.value)
         return '{}({!r})'.format(type(self).__name__, self.value)
 
     def serialize(self):
-        if type(self) == BaseFilter:
+        if type(self) is BaseFilter:
             return self.value
         return {type(self).__name__: self.value}
 
@@ -243,4 +240,4 @@ def matches(self, value):
 
 
 # Collect all classes that are subclass of BaseFilter (exclusive)
-filter_classes = [v for v in globals().values() if type(v) == type and BaseFilter in v.mro()[1:]]
+filter_classes = [v for v in globals().values() if type(v) is type and BaseFilter in v.mro()[1:]]

adminapi/request.py

@@ -4,46 +4,44 @@
 """
 
 import gzip
+import hmac
+import json
 import logging
 import os
+import time
+from base64 import b64encode
+from datetime import datetime, timezone
 from hashlib import sha1
-import hmac
 from http.client import IncompleteRead
 from socket import timeout
 from ssl import SSLError
-import time
-import json
-from base64 import b64encode
-from datetime import datetime, timezone
-
 from urllib.error import HTTPError, URLError
 from urllib.parse import urlencode
-from urllib.request import urlopen, Request
+from urllib.request import Request, urlopen
 
 from paramiko.agent import Agent
 from paramiko.message import Message
-from paramiko.ssh_exception import SSHException, PasswordRequiredException
+from paramiko.ssh_exception import PasswordRequiredException, SSHException
 
 from adminapi import VERSION
 
 try:
-    from paramiko import RSAKey, ECDSAKey, Ed25519Key
+    from paramiko import ECDSAKey, Ed25519Key, RSAKey
 
     key_classes = (RSAKey, ECDSAKey, Ed25519Key)
 except ImportError:
     # Ed25519Key requires paramiko >= 2.2
-    from paramiko import RSAKey, ECDSAKey
+    from paramiko import ECDSAKey, RSAKey
 
     key_classes = (RSAKey, ECDSAKey)
 
 from adminapi.cmduser import get_auth_token
-from adminapi.filters import BaseFilter
 from adminapi.exceptions import (
     ApiError,
     AuthenticationError,
     ConfigurationError,
 )
-
+from adminapi.filters import BaseFilter
 
 logger = logging.getLogger(__name__)
 

serveradmin/serverdb/models.py

@@ -7,13 +7,13 @@
 from distutils.util import strtobool
 from ipaddress import (
     IPv4Address,
-    IPv6Address,
-    ip_interface,
     IPv4Interface,
-    IPv6Interface,
-    ip_network,
     IPv4Network,
+    IPv6Address,
+    IPv6Interface,
     IPv6Network,
+    ip_interface,
+    ip_network,
 )
 from typing import Optional, Union
 

serveradmin/serverdb/query_committer.py

@@ -15,20 +15,20 @@
 from adminapi.request import json_encode_extra
 from serveradmin.apps.models import Application
 from serveradmin.serverdb.models import (
-    Servertype,
     Attribute,
+    Change,
+    ChangeCommit,
     Server,
     ServerAttribute,
     ServerRelationAttribute,
-    ChangeCommit,
-    Change,
+    Servertype,
     ServertypeAttribute,
 )
 from serveradmin.serverdb.query_materializer import (
     QueryMaterializer,
     get_default_attribute_values,
 )
-from serveradmin.serverdb.signals import pre_commit, post_commit
+from serveradmin.serverdb.signals import post_commit, pre_commit
 
 logger = logging.getLogger(__name__)
 

serveradmin/serverdb/query_materializer.py

@@ -9,19 +9,19 @@
 # object methods.
 
 import itertools
-
 from ipaddress import IPv4Address, IPv6Address
-from django.db.models import OuterRef, Subquery, AutoField
+
+from django.db.models import AutoField, OuterRef, Subquery
 
 from adminapi.dataset import DatasetObject
 from serveradmin.serverdb.models import (
-    Servertype,
     Attribute,
-    ServertypeAttribute,
     Server,
     ServerAttribute,
-    ServerRelationAttribute,
     ServerInetAttribute,
+    ServerRelationAttribute,
+    Servertype,
+    ServertypeAttribute,
 )
 
 

serveradmin/serverdb/sql_generator.py

@@ -56,7 +56,7 @@ def _get_sql_condition(attribute, filt, related_vias):
     if attribute.type == 'boolean':
         # We have already dealt with the logical filters.  Other
         # complicated filters don't make any sense on booleans.
-        if type(filt) != BaseFilter:
+        if type(filt) is BaseFilter:
             raise FilterValueError(
                 'Boolean attribute "{}" cannot be used with {}() filter'.format(attribute, type(filt).__name__)
             )
@@ -106,7 +106,7 @@ def _logical_filter_sql_condition(attribute, filt, related_vias):
     simple_values = []
     templates = []
     for value in filt.values:
-        if type(filt) == Any and type(value) == BaseFilter:
+        if type(filt) is Any and type(value) is BaseFilter:
             simple_values.append(value)
         else:
             templates.append(_get_sql_condition(attribute, value, related_vias))

serveradmin/serverdb/tests/test_acls.py

@@ -416,5 +416,5 @@ def test_hijack_objects_not_possible(self):
         changed_object['servertype'] = 'test0'  # Attacker attempts to hijack object
         changed_objects = {changed_object['object_id']: changed_object}
 
-        with self.assertRaises(PermissionDenied) as error:
+        with self.assertRaises(PermissionDenied):
             query_committer._access_control(user, None, unchanged_objects, {}, changed_objects, {})

serveradmin/serverdb/tests/test_ip_addr_type.py

@@ -12,7 +12,7 @@
 from faker import Faker
 from faker.providers import internet
 
-from serveradmin.dataset import Query, DatasetObject
+from serveradmin.dataset import DatasetObject, Query
 from serveradmin.serverdb.forms import ServertypeAttributeAdminForm
 from serveradmin.serverdb.models import ServertypeAttribute