iteritems -> items

Queue -> queue

diff --git a/jenkinsapi/api.py b/jenkinsapi/api.py
index 156f3ac499fd2f849fe3cee9427cd1e721283608..f672c2a1afd9e90ec1d4880f862139bcf51020e7 100644 (file)
--- a/jenkinsapi/api.py
+++ b/jenkinsapi/api.py
@@ -221,7 +221,13 @@ def search_artifact_by_regexp(jenkinsurl, jobid, artifactRegExp,
 
         artifacts = build.get_artifact_dict()
 
-        for name, art in artifacts.iteritems():
+        try:
+            it = artifacts.iteritems()
+        except AttributeError:
+            # Python3
+            it = artifacts.items()
+
+        for name, art in it:
             md_match = artifactRegExp.search(name)
 
             if md_match:

diff --git a/jenkinsapi/job.py b/jenkinsapi/job.py
index b8f97d9d8f2b0ea181de7290a5bd23b1a8b4ca23..ace3f5e12dcf6717e074e026bc3374415e8769be 100644 (file)
--- a/jenkinsapi/job.py
+++ b/jenkinsapi/job.py
@@ -145,8 +145,15 @@ class Job(JenkinsBase, MutableJenkinsThing):
         """
         assert isinstance(
             build_params, dict), 'Build parameters must be a dict'
+
+        try:
+            it = build_params.iteritems()
+        except AttributeError:
+            # Python3
+            it = build_params.items()
+
         return {'parameter': [
-            {'name': k, 'value': v} for k, v in build_params.iteritems()
+            {'name': k, 'value': v} for k, v in it
         ]}
 
     @staticmethod

diff --git a/jenkinsapi/view.py b/jenkinsapi/view.py
index 9afd42f0fe7e1288babc91a0c21d26301d3ed9fc..78d8cb11d4a9f0989a636a0256eb03f433a82f35 100644 (file)
--- a/jenkinsapi/view.py
+++ b/jenkinsapi/view.py
@@ -54,7 +54,13 @@ class View(JenkinsBase):
         return self.get_job_dict().keys()
 
     def iteritems(self):
-        for name, url in self.get_job_dict().iteritems():
+        try:
+            it = self.get_job_dict().iteritems()
+        except AttributeError:
+            # Python3
+            it = self.get_job_dict().items()
+
+        for name, url in it:
             api_url = self.python_api_url(url)
             yield name, Job(api_url, name, self.jenkins_obj)
 

diff --git a/jenkinsapi_utils/jenkins_launcher.py b/jenkinsapi_utils/jenkins_launcher.py
index f74a1d08e0902583b5cd19cd039aea131ec0c4a4..b91b92d33955d0fa9073ad15e77c9e780e9c1bcc 100644 (file)
--- a/jenkinsapi_utils/jenkins_launcher.py
+++ b/jenkinsapi_utils/jenkins_launcher.py
@@ -1,6 +1,9 @@
 import os
 import time
-import Queue
+try:
+    import Queue
+except ImportError:
+    import queue as Queue
 import random
 import shutil
 import logging