From 389afe422cce6a77564cf6c55869117e1284bea5 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Fri, 30 Oct 2015 15:14:35 +0900
Subject: [PATCH] Remove ordereddict support from py26

python 2.6 is no longer supported and adding a marker
to requirements.txt for installing ordereddict only in py2.6
envs was not an option because markers are not supported in
older pip versions.
So remove python 2.6 support completly.

Change-Id: Iebdd999b469c9a9681b0d7e9f50cc488a8820953
---
 jenkins_jobs/local_yaml.py       | 5 +----
 jenkins_jobs/modules/triggers.py | 6 +-----
 requirements.txt                 | 1 -
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/jenkins_jobs/local_yaml.py b/jenkins_jobs/local_yaml.py
index 5cb78820a..aaeaead70 100644
--- a/jenkins_jobs/local_yaml.py
+++ b/jenkins_jobs/local_yaml.py
@@ -102,10 +102,7 @@ import yaml
 from yaml.constructor import BaseConstructor
 from yaml import YAMLObject
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
+from collections import OrderedDict
 
 
 logger = logging.getLogger(__name__)
diff --git a/jenkins_jobs/modules/triggers.py b/jenkins_jobs/modules/triggers.py
index 0ddef3ff8..d4f7851d0 100644
--- a/jenkins_jobs/modules/triggers.py
+++ b/jenkins_jobs/modules/triggers.py
@@ -29,6 +29,7 @@ Example::
       - timed: '@daily'
 """
 
+from collections import OrderedDict
 import logging
 import re
 import xml.etree.ElementTree as XML
@@ -41,11 +42,6 @@ from jenkins_jobs.errors import MissingAttributeError
 import jenkins_jobs.modules.base
 from jenkins_jobs.modules import hudson_model
 
-try:
-    from collections import OrderedDict
-except ImportError:
-    from ordereddict import OrderedDict
-
 logger = logging.getLogger(str(__name__))
 
 
diff --git a/requirements.txt b/requirements.txt
index ae6c212de..57c3a3776 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
-ordereddict
 six>=1.5.2
 PyYAML
 python-jenkins>=0.4.8