From: Lars Hupfeldt <lhn@hupfeldtit.dk>
Date: Thu, 13 Feb 2014 20:38:48 +0000 (+0100)
Subject: iteritems -> items
X-Git-Tag: v0.2.23~23^2~4^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=09c4a70159c82537f48cfae69d7a260fb5b3146a;p=tools%2Fpython-jenkinsapi.git

iteritems -> items
Queue -> queue
---

diff --git a/jenkinsapi/api.py b/jenkinsapi/api.py
index 156f3ac..f672c2a 100644
--- 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 b8f97d9..ace3f5e 100644
--- 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 9afd42f..78d8cb1 100644
--- 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 f74a1d0..b91b92d 100644
--- 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