From 520f82497804b26df7624f44dfedad9303ebe6d9 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Wed, 14 Mar 2012 22:55:45 -0400 Subject: [PATCH] Add __reduce__() method to BitwiseOperator and _NamedInt. This makes it possible to successfully pickle and deepcopy instances of these types [1,2]. This gets the TRIG_SRC.now == copy.deepcopy(TRIG_SRC.now) doctest working, which I needed to successfully dump h5config ChoiceConfig objects that use _Enum choices [3]. For example, the newly fixed pypiezo.config.ChannelConfig [4] uses the AREF enum values as possible choices for it's `analog-reference` setting. h5config makes deepcopies of mutable objects to avoid confusion if the mutable is changed externally. It then compares the deepcopies with uncopied values. Now that deepcopying works for _NamedInts, the h5config behavior will work. [1] http://docs.python.org/library/pickle.html#pickling-and-unpickling-extension-types [2] http://docs.python.org/library/copy.html [3] http://pypi.python.org/pypi/h5config/ [4] http://pypi.python.org/pypi/pypiezo/ --- pycomedi/constant.pyx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pycomedi/constant.pyx b/pycomedi/constant.pyx index 1f89219..ae981d7 100644 --- a/pycomedi/constant.pyx +++ b/pycomedi/constant.pyx @@ -191,6 +191,9 @@ cdef class BitwiseOperator (object): else: raise ValueError(op) + def __reduce__(self): + return (BitwiseOperator, (self.value,)) + class _NamedInt (BitwiseOperator): "A flag or enum item." @@ -205,6 +208,9 @@ class _NamedInt (BitwiseOperator): def __repr__(self): return '<%s %s>' % (self.__class__.__name__, self.name) + def __reduce__(self): + return (_NamedInt, (self.name, self.value, self.doc)) + class _Enum (list): "An enumerated list" @@ -256,7 +262,6 @@ class _Enum (list): self._value_keys[item.value] = item setattr(self, item.name, item) - def index_by_name(self, name): return self._name_keys[name] -- 2.26.2