From 322b0ec423910794a1ea9a4ccbe59af54d16d270 Mon Sep 17 00:00:00 2001 From: Jim Paris Date: Mon, 26 Aug 2019 15:40:07 -0400 Subject: [PATCH] Remove impossible error in serializer and test with a C module --- nilmdb/utils/serializer.py | 11 ++++------- tests/test_serializer.py | 7 +++++++ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/nilmdb/utils/serializer.py b/nilmdb/utils/serializer.py index 0b72b10..306015a 100644 --- a/nilmdb/utils/serializer.py +++ b/nilmdb/utils/serializer.py @@ -68,13 +68,10 @@ def serializer_proxy(obj_or_type): class SerializerObjectProxy(object): def __init__(self, obj_or_type, *args, **kwargs): self.__object = obj_or_type - try: - if type(obj_or_type) == type: - classname = obj_or_type.__name__ - else: - classname = obj_or_type.__class__.__name__ - except AttributeError: # pragma: no cover - classname = "???" + if type(obj_or_type) == type: + classname = obj_or_type.__name__ + else: + classname = obj_or_type.__class__.__name__ self.__call_queue = queue.Queue() self.__thread = SerializerThread(classname, self.__call_queue) self.__thread.daemon = True diff --git a/tests/test_serializer.py b/tests/test_serializer.py index b159246..907a2d1 100644 --- a/tests/test_serializer.py +++ b/tests/test_serializer.py @@ -6,6 +6,7 @@ from nose.tools import * from nose.tools import assert_raises import threading import time +import nilmdb.server from testutil.helpers import * @@ -120,3 +121,9 @@ class TestSerializer(Base): # trigger exception in __del__, which should be ignored foo._SerializerObjectProxy__call_queue = None del foo + + def test_rocket(self): + # Serializer works on a C module? + sp = nilmdb.utils.serializer_proxy + rkt = sp(nilmdb.server.rocket.Rocket("int32_8", None)) + eq_(rkt.binary_size, 40)