Update to 0.4.7

4 files changed, 42 insertions, 9 deletions

diff --git a/.gitignore b/.gitignore
index 96affd4..3c1aef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /python-jenkins-0.2.1.tar.gz
 /python-jenkins-0.4.1.tar.gz
 /python-jenkins-0.4.5.tar.gz
+/python-jenkins-0.4.7.tar.gz
diff --git a/python-jenkins-0.4.5-six-1.3.patch b/python-jenkins-0.4.7-six-1.3.patch
index e9ff064..4a1aa8d 100644
--- a/python-jenkins-0.4.5-six-1.3.patch
+++ b/python-jenkins-0.4.7-six-1.3.patch
@@ -16,8 +16,11 @@ 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
+@@ -49,13 +49,20 @@ import re
+ import json
+ import re
  import socket
++import sys
  
  import six
 -from six.moves.http_client import BadStatusLine
@@ -39,23 +42,49 @@ index 829f726..aa56b62 100644
  
  LAUNCHER_SSH = 'hudson.plugins.sshslaves.SSHLauncher'
  LAUNCHER_COMMAND = 'hudson.slaves.CommandLauncher'
+@@ -416,10 +416,10 @@
+                     "Error communicating with server[%s]: "
+                     "empty response" % self.server)
+ 
+-            if six.PY2:
++            if sys.version_info[0] == 2:
+                 return response.info().getheader('X-Jenkins')
+ 
+-            if six.PY3:
++            if sys.version_info[0] == 3:
+                 return response.getheader('X-Jenkins')
+ 
+         except (HTTPError, BadStatusLine):
 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:
+@@ -8,8 +8,13 @@ else:
  
  from mock import patch, Mock
  import six
 -from six.moves.urllib.error import HTTPError
+-from six.moves.urllib.request import build_opener
 +try:
 +    from six.moves.urllib.error import HTTPError
++    from six.moves.urllib.request import build_opener
 +except ImportError:
 +    # six 1.3
 +    from urllib2 import HTTPError
++    from urllib2 import build_opener
  
  from tests.helper import jenkins
  
--- 
-2.3.6
-
+@@ -688,10 +688,10 @@
+         j = jenkins.Jenkins('http://example.com/', 'test', 'test')
+ 
+         mock_response = Mock()
+-        if six.PY2:
++        if sys.version_info[0] == 2:
+             config = {'info.return_value.getheader.return_value': 'Version42'}
+ 
+-        if six.PY3:
++        if sys.version_info[0] == 3:
+             config = {'getheader.return_value': 'Version42'}
+ 
+         mock_response.configure_mock(**config)
diff --git a/python-jenkins.spec b/python-jenkins.spec
index e3e8fc9..a823cc9 100644
--- a/python-jenkins.spec
+++ b/python-jenkins.spec
@@ -3,15 +3,15 @@
 %endif
 
 Name:           python-jenkins
-Version:        0.4.5
-Release:        2%{?dist}
+Version:        0.4.7
+Release:        1%{?dist}
 Summary:        Python bindings for the remote Jenkins API
 
 Group:          Development/Libraries
 License:        BSD
 URL:            http://python-jenkins.readthedocs.org/en/latest
 Source0:        https://pypi.python.org/packages/source/p/%{name}/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.4.5-six-1.3.patch
+Patch0:         %{name}-0.4.7-six-1.3.patch
 
 BuildArch:      noarch
 
@@ -134,6 +134,9 @@ popd
 %endif
 
 %changelog
+* Tue Jun 30 2015 Scott K Logan <logans@cottsay.net> - 0.4.7-1
+- Update to 0.4.7
+
 * Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.5-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
diff --git a/sources b/sources
index 709e938..ceff5b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10f1c24d45afe9cadd43f8d60b37d04c  python-jenkins-0.4.5.tar.gz
+8f16638c8b0aa3a0d6343bdce854ca6e  python-jenkins-0.4.7.tar.gz