From 617b77acfb9c073923bd29fca9895b59b22cd38e Mon Sep 17 00:00:00 2001
From: Ken Dreyer <ktdreyer@ktdreyer.com>
Date: Mon, 4 May 2015 12:35:40 -0600
Subject: add support for EL7

---
 python-jenkins-six-1.3.patch | 61 ++++++++++++++++++++++++++++++++++++++++++++
 python-jenkins.spec          |  4 +++
 2 files changed, 65 insertions(+)
 create mode 100644 python-jenkins-six-1.3.patch

diff --git a/python-jenkins-six-1.3.patch b/python-jenkins-six-1.3.patch
new file mode 100644
index 0000000..e9ff064
--- /dev/null
+++ b/python-jenkins-six-1.3.patch
@@ -0,0 +1,61 @@
+From 41f25818fd7bb8703f465ef60128ab7fab864903 Mon Sep 17 00:00:00 2001
+From: Ken Dreyer <ktdreyer@ktdreyer.com>
+Date: Mon, 4 May 2015 10:02:24 -0600
+Subject: [PATCH] support six 1.3
+
+RHEL 7.1 ships python-six-1.3. This old version does not support
+directly importing the various modules we need from six.moves.
+
+Change-Id: I60a5f4be7e17b60f58927b162236d89d4a504135
+---
+ jenkins/__init__.py   | 16 +++++++++++-----
+ tests/test_jenkins.py |  6 +++++-
+ 2 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/jenkins/__init__.py b/jenkins/__init__.py
+index 829f726..aa56b62 100644
+--- a/jenkins/__init__.py
++++ b/jenkins/__init__.py
+@@ -51,11 +51,17 @@ import re
+ import socket
+ 
+ import six
+-from six.moves.http_client import BadStatusLine
+-from six.moves.urllib.error import HTTPError
+-from six.moves.urllib.error import URLError
+-from six.moves.urllib.parse import quote, urlencode
+-from six.moves.urllib.request import Request, urlopen
++try:
++    from six.moves.http_client import BadStatusLine
++    from six.moves.urllib.error import HTTPError
++    from six.moves.urllib.error import URLError
++    from six.moves.urllib.parse import quote, urlencode
++    from six.moves.urllib.request import Request, urlopen
++except ImportError:
++    # six 1.3
++    from httplib import BadStatusLine
++    from urllib import quote, urlencode
++    from urllib2 import HTTPError, URLError, Request, urlopen
+ 
+ LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
+ LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
+diff --git a/tests/test_jenkins.py b/tests/test_jenkins.py
+index b59f798..ecb00cf 100644
+--- a/tests/test_jenkins.py
++++ b/tests/test_jenkins.py
+@@ -8,7 +8,11 @@ else:
+ 
+ from mock import patch, Mock
+ import six
+-from six.moves.urllib.error import HTTPError
++try:
++    from six.moves.urllib.error import HTTPError
++except ImportError:
++    # six 1.3
++    from urllib2 import HTTPError
+ 
+ from tests.helper import jenkins
+ 
+-- 
+2.3.6
+
diff --git a/python-jenkins.spec b/python-jenkins.spec
index 9e0a3d9..e501681 100644
--- a/python-jenkins.spec
+++ b/python-jenkins.spec
@@ -1,3 +1,7 @@
+%if 0%{?fedora}
+%global with_python3 1
+%endif
+
 Name:           python-jenkins
 Version:        0.4.5
 Release:        1%{?dist}
-- 
cgit