Commit 3f2a3b18 authored by Sebastien Petitdemange's avatar Sebastien Petitdemange
Browse files

Merge branch 'multiplexer_py26' into 'master'

multiplexer: fix to work on python 2.6

See merge request !435
parents 871d0366 ec848a73
......@@ -5,11 +5,18 @@
# Copyright (c) 2016 Beamline Control Unit, ESRF
# Distributed under the GNU LGPLv3. See LICENSE for more info.
import collections
OrderedDict = collections.OrderedDict
except AttributeError:
from ordereddict import OrderedDict
import gevent
from .opiom import Opiom
from bliss.config import static
from bliss.config.settings import HashObjSetting
from collections import OrderedDict
class Output:
class Node:
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment