From e7410af0514ef5d41466273271ec6a65547d8d6a Mon Sep 17 00:00:00 2001
From: Tristan Cacqueray <tdecacqu@redhat.com>
Date: Mon, 19 Jun 2017 04:32:08 +0000
Subject: [PATCH] requirements: remove ordereddict

OrderedDict is included in python3 collections module.

Change-Id: I63c91e22a8f03a5e2598a224f0b1018c2951d67b
---
 requirements.txt        | 1 -
 zuul/lib/clonemapper.py | 6 +-----
 zuul/model.py           | 5 +----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 746bbcb67d..eda36c62d5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,6 @@ Paste
 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 57ac177100..308260e117 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 re
 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 610b9b64fa..62ed92e4d2 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"