Make refactor work with python3

dls-controls · Aug 9, 2016 · 02fa86d · 02fa86d
1 parent eb2ebad
commit 02fa86d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/malcolm/core/__init__.py b/malcolm/core/__init__.py
@@ -18,4 +18,3 @@
     DefaultStateMachine  # noqa
 from malcolm.core.syncfactory import SyncFactory  # noqa
 from malcolm.core.table import Table  # noqa
-import vmetas  # noqa
diff --git a/malcolm/core/serializable.py b/malcolm/core/serializable.py
@@ -53,13 +53,16 @@ def __iter__(self):
 
     def __getitem__(self, item):
         """Dictionary access to endpoint data"""
-        return self._endpoint_data[item]
+        try:
+            return self._endpoint_data[item]
+        except (KeyError, TypeError):
+            raise KeyError(item)
 
     def __getattr__(self, item):
         """Attr access to endpoint data, if not already in self"""
         try:
             return self._endpoint_data[item]
-        except KeyError:
+        except (KeyError, TypeError):
             raise AttributeError(item)
 
     def __setattr__(self, item, value):