Styling tweaks

malcolm/core/attributemeta.py

@@ -1,4 +1,4 @@
-from loggable import Loggable
+from malcolm.core.loggable import Loggable
 
 
 class AttributeMeta(Loggable):

malcolm/core/block.py

@@ -1,6 +1,6 @@
 from collections import OrderedDict
 
-from loggable import Loggable
+from malcolm.core.loggable import Loggable
 
 
 class Block(Loggable):

malcolm/core/controller.py

@@ -1,4 +1,4 @@
-from loggable import Loggable
+from malcolm.core.loggable import Loggable
 
 
 class Controller(Loggable):

malcolm/core/mapmeta.py

@@ -1,7 +1,6 @@
 from collections import OrderedDict
 
-from loggable import Loggable
-from malcolm.core.attributemeta import AttributeMeta
+from malcolm.core.loggable import Loggable
 
 
 class MapMeta(Loggable):

malcolm/core/method.py

@@ -1,7 +1,8 @@
 #!/bin/env dls-python
 from collections import OrderedDict
 
-from loggable import Loggable
+from malcolm.core.loggable import Loggable
+
 
 class Method(Loggable):
     """Exposes a function with metadata for arguments and return values"""
@@ -20,15 +21,18 @@ def set_function(self, func):
         """
         self.func = func
 
-    def set_function_takes(self, arg_meta, defaults = None):
+    def set_function_takes(self, arg_meta, defaults=None):
         """Set the arguments and default values for the method
 
         Args:
             arg_meta (MapMeta): Arguments to the function
             default (dict): Default values for arguments (default None)
         """
         self.takes = arg_meta
-        self.defaults = OrderedDict(defaults) if defaults is not None else OrderedDict()
+        if defaults is not None:
+            self.defaults = OrderedDict(defaults)
+        else:
+            self.defaults = OrderedDict()
 
     def set_function_returns(self, return_meta):
         """Set the return parameters for the method to validate against"""
@@ -44,11 +48,13 @@ def __call__(self, *args, **kwargs):
                 if arg in self.defaults.keys():
                     kwargs[arg] = self.defaults[arg]
                 elif arg in self.takes.required:
-                    raise ValueError("Argument %s is required but was not provided" % arg)
+                    raise ValueError(
+                        "Argument %s is required but was not provided" % arg)
         return_val = self.func(kwargs)
         if self.returns is not None:
             if return_val.keys() != self.returns.elements.keys():
-                raise ValueError("Return result did not match specified return structure")
+                raise ValueError(
+                    "Return result did not match specified return structure")
             for r_name, r_val in return_val.iteritems():
                 self.returns.elements[r_name].validate(r_val)
         return return_val

malcolm/core/stringmeta.py

@@ -13,7 +13,7 @@ def validate(self, value):
         string and returns it
 
         Args:
-            value(): Value to validate
+            value: Value to validate
 
         Returns:
             str: Value as a string [If value is not None]