From 2c9a8e65b4864e465db9a7f7d40cc50a1808a452 Mon Sep 17 00:00:00 2001
From: Peter LaFosse <peter@vector35.com>
Date: Tue, 24 Aug 2021 16:50:32 -0400
Subject: Some normalizing code changes

---
 python/websocketprovider.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'python/websocketprovider.py')

diff --git a/python/websocketprovider.py b/python/websocketprovider.py
index a1a6681b..2157d13a 100644
--- a/python/websocketprovider.py
+++ b/python/websocketprovider.py
@@ -34,14 +34,8 @@ else:
 import binaryninja._binaryninjacore as core
 
 import binaryninja
-from binaryninja import settings
-from binaryninja import with_metaclass
-from binaryninja import startup
-from binaryninja import log
+from . import log
 
-# 2-3 compatibility
-from binaryninja import pyNativeStr
-from binaryninja import range
 
 
 def nop(*args, **kwargs):
@@ -252,7 +246,7 @@ class _WebsocketProviderMetaclass(type):
 			raise AttributeError("attribute '%s' is read only" % name)
 
 
-class WebsocketProvider(with_metaclass(_WebsocketProviderMetaclass, object)):
+class WebsocketProvider(metaclass=_WebsocketProviderMetaclass):
 	name = None
 	instance_class = None
 	_registered_providers = []
@@ -271,6 +265,7 @@ class WebsocketProvider(with_metaclass(_WebsocketProviderMetaclass, object)):
 
 	def _create_instance(self, ctxt):
 		try:
+			assert self.__class__.instance_class is not None, "instance_class can not be None"
 			result = self.__class__.instance_class(self)
 			if result is None:
 				return None
-- 
cgit v1.3.1