aboutsummaryrefslogtreecommitdiffstats
path: root/core/loader
diff options
context:
space:
mode:
Diffstat (limited to 'core/loader')
-rwxr-xr-xcore/loader/loader.py6
-rw-r--r--core/loader/loader_servant.py4
2 files changed, 5 insertions, 5 deletions
diff --git a/core/loader/loader.py b/core/loader/loader.py
index 0d9c83a6..b0990fa7 100755
--- a/core/loader/loader.py
+++ b/core/loader/loader.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Intel Corporation.
+# Copyright 2015-2017 Intel Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,11 +17,11 @@
from conf import settings
from core.loader.loader_servant import LoaderServant
-from tools.pkt_gen.trafficgen import ITrafficGenerator
from tools.collectors.collector import ICollector
+from tools.pkt_fwd.pkt_fwd import IPktFwd
+from tools.pkt_gen.trafficgen import ITrafficGenerator
from vswitches.vswitch import IVSwitch
from vnfs.vnf.vnf import IVnf
-from tools.pkt_fwd.pkt_fwd import IPktFwd
class Loader(object):
"""Loader class - main object context holder.
diff --git a/core/loader/loader_servant.py b/core/loader/loader_servant.py
index 226b0931..bbb4ea9d 100644
--- a/core/loader/loader_servant.py
+++ b/core/loader/loader_servant.py
@@ -1,4 +1,4 @@
-# Copyright 2015 Intel Corporation.
+# Copyright 2015-2017 Intel Corporation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -142,7 +142,7 @@ class LoaderServant(object):
# find all classes derived from given interface, but suppress
# interface itself and any abstract class starting with iface name
gens = dict((k, v) for (k, v) in list(mod.__dict__.items())
- if type(v) == type and
+ if isinstance(v, type) and
issubclass(v, interface) and
not k.startswith(interface.__name__))
if gens: