From 236aca020d200a7e12b8c4659928c79b95c464cd Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 16 Feb 2015 10:59:18 +0000 Subject: [PATCH 1/2] Add ordereddict package for Python 2.6 --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index da7340f..5cf8056 100755 --- a/setup.py +++ b/setup.py @@ -7,6 +7,7 @@ from ts3 import __version__ tests_require = ['mock'] if sys.version < '2.7': tests_require.append('unittest2') + tests_require.append('ordereddict') setup( name="python-ts3", From a20bc66eab311f94039f329e50f44600617f154b Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Mon, 16 Feb 2015 11:00:09 +0000 Subject: [PATCH 2/2] Import from ordereddict for Py2.6 --- ts3/test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ts3/test.py b/ts3/test.py index 296d659..291f94a 100644 --- a/ts3/test.py +++ b/ts3/test.py @@ -6,7 +6,10 @@ except ImportError: import socket import threading import time -from collections import OrderedDict +try: + from collections import OrderedDict +except ImportError: + from ordereddict import OrderedDict from ts3.protocol import TS3Proto, ConnectionError, NoConnectionError