Merge "requirements: remove ordereddict" into feature/zuulv3
diff --git a/requirements.txt b/requirements.txt
index 746bbcb..eda36c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@
WebOb>=1.2.3
paramiko>=1.8.0,<2.0.0
GitPython>=0.3.3,<2.1.2
-ordereddict
python-daemon>=2.0.4,<2.1.0
extras
statsd>=1.0.0,<3.0
diff --git a/zuul/lib/clonemapper.py b/zuul/lib/clonemapper.py
index 57ac177..308260e 100644
--- a/zuul/lib/clonemapper.py
+++ b/zuul/lib/clonemapper.py
@@ -14,7 +14,7 @@
# under the License.
from collections import defaultdict
-import extras
+from collections import OrderedDict
import logging
import os
import re
@@ -22,10 +22,6 @@
import six
-OrderedDict = extras.try_imports(['collections.OrderedDict',
- 'ordereddict.OrderedDict'])
-
-
class CloneMapper(object):
log = logging.getLogger("zuul.CloneMapper")
diff --git a/zuul/model.py b/zuul/model.py
index 610b9b6..62ed92e 100644
--- a/zuul/model.py
+++ b/zuul/model.py
@@ -13,19 +13,16 @@
# under the License.
import abc
+from collections import OrderedDict
import copy
import logging
import os
import struct
import time
from uuid import uuid4
-import extras
import six
-OrderedDict = extras.try_imports(['collections.OrderedDict',
- 'ordereddict.OrderedDict'])
-
MERGER_MERGE = 1 # "git merge"
MERGER_MERGE_RESOLVE = 2 # "git merge -s resolve"