Split part of get_client into get_client_class

get_client_class gets the callable class for the given client name

Author: achow101

hwilib/commands.py

@@ -11,21 +11,29 @@
 from .descriptor import Descriptor
 from .devices import __all__ as all_devs
 
-# Get the client for the device
-def get_client(device_type, device_path, password='', expert=False):
+def get_client_class(device_type):
     device_type = device_type.split('_')[0]
     class_name = device_type.capitalize()
     module = device_type.lower()
 
-    client = None
     try:
         imported_dev = importlib.import_module('.devices.' + module, __package__)
         client_constructor = getattr(imported_dev, class_name + 'Client')
-        client = client_constructor(device_path, password, expert)
     except ImportError:
+        raise UnknownDeviceError('Unknown device type specified')
+
+    return client_constructor
+
+# Get the client for the device
+def get_client(device_type, device_path, password='', expert=False):
+    client = None
+    try:
+        client_constructor = get_client_class(device_type)
+        client = client_constructor(device_path, password, expert)
+    except:
         if client:
             client.close()
-        raise UnknownDeviceError('Unknown device type specified')
+        raise
 
     return client