From 0753f48e312306f47c39de2e1e91ac566811c9f0 Mon Sep 17 00:00:00 2001 From: Hart Date: Wed, 3 Aug 2016 20:02:54 -0400 Subject: [PATCH] Adding ordereddict dependency of py26 Using the ordereddict package instead of odict --- pyutilib/misc/pyyaml_util.py | 2 +- pyutilib/misc/xmltodict.py | 2 +- setup.py | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pyutilib/misc/pyyaml_util.py b/pyutilib/misc/pyyaml_util.py index 38949678..74d8d96e 100644 --- a/pyutilib/misc/pyyaml_util.py +++ b/pyutilib/misc/pyyaml_util.py @@ -20,7 +20,7 @@ try: # pragma no cover from collections import OrderedDict except ImportError: # pragma no cover - from odict import OrderedDict + from ordereddict import OrderedDict try: from StringIO import StringIO except: diff --git a/pyutilib/misc/xmltodict.py b/pyutilib/misc/xmltodict.py index 2dc8d174..07426c9f 100644 --- a/pyutilib/misc/xmltodict.py +++ b/pyutilib/misc/xmltodict.py @@ -22,7 +22,7 @@ #OrderedDict = dict from collections import OrderedDict except ImportError: # pragma no cover - from odict import OrderedDict + from ordereddict import OrderedDict try: # pragma no cover _basestring = basestring diff --git a/setup.py b/setup.py index 09f65300..242546ee 100644 --- a/setup.py +++ b/setup.py @@ -42,6 +42,7 @@ def read(*rnames): requires=[ 'nose', 'six' ] if sys.version_info < (2,7): requires.append('argparse') + requires.append('ordereddict') requires.append('unittest2') setup(name="PyUtilib",