mirror of
https://github.com/nikdoof/python-ts3.git
synced 2025-12-16 00:32:15 +00:00
Merge pull request #12 from nikdoof/nikdoof-py26-test-fixes
Add ordereddict package for Python 2.6
This commit is contained in:
1
setup.py
1
setup.py
@@ -7,6 +7,7 @@ from ts3 import __version__
|
|||||||
tests_require = ['mock']
|
tests_require = ['mock']
|
||||||
if sys.version < '2.7':
|
if sys.version < '2.7':
|
||||||
tests_require.append('unittest2')
|
tests_require.append('unittest2')
|
||||||
|
tests_require.append('ordereddict')
|
||||||
|
|
||||||
setup(
|
setup(
|
||||||
name="python-ts3",
|
name="python-ts3",
|
||||||
|
|||||||
@@ -6,7 +6,10 @@ except ImportError:
|
|||||||
import socket
|
import socket
|
||||||
import threading
|
import threading
|
||||||
import time
|
import time
|
||||||
from collections import OrderedDict
|
try:
|
||||||
|
from collections import OrderedDict
|
||||||
|
except ImportError:
|
||||||
|
from ordereddict import OrderedDict
|
||||||
from ts3.protocol import TS3Proto, ConnectionError, NoConnectionError
|
from ts3.protocol import TS3Proto, ConnectionError, NoConnectionError
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user