1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
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
|
