diff options
| author | Peter LaFosse <peter@vector35.com> | 2021-08-24 16:50:32 -0400 |
|---|---|---|
| committer | Peter LaFosse <peter@vector35.com> | 2021-09-06 11:46:38 -0400 |
| commit | 2c9a8e65b4864e465db9a7f7d40cc50a1808a452 (patch) | |
| tree | 99c66588edb7e15e8b909117ceeecfeb05397cb3 /python | |
| parent | e0841aa1bf02b5ed90aac8e4f2a0d8d4c58128f3 (diff) | |
Some normalizing code changes
Diffstat (limited to 'python')
| -rw-r--r-- | python/downloadprovider.py | 1 | ||||
| -rw-r--r-- | python/websocketprovider.py | 11 |
2 files changed, 4 insertions, 8 deletions
diff --git a/python/downloadprovider.py b/python/downloadprovider.py index 3104b08d..bcc0bf16 100644 --- a/python/downloadprovider.py +++ b/python/downloadprovider.py @@ -284,6 +284,7 @@ class DownloadProvider(metaclass=_DownloadProviderMetaclass): def _create_instance(self, ctxt): try: + assert self.__class__.instance_class is not None, "instance_class is None" result = self.__class__.instance_class(self) if result is None: return None 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 |