Pep8 fixes + remove bogus imports

diff --git a/jenkinsapi/job.py b/jenkinsapi/job.py
index 9f79529f74636e8342220da79717cf8f955c1822..c298e70ae608e54b56fd728198e2e9ebe3a69fbc 100644 (file)
--- a/jenkinsapi/job.py
+++ b/jenkinsapi/job.py
@@ -173,7 +173,6 @@ class Job(JenkinsBase, MutableJenkinsThing):
         assert isinstance(block, bool)
         assert isinstance(skip_if_running, bool)
 
-
         # Either copy the params dict or make a new one.
         build_params = build_params and dict(
             build_params.items()) or {}  # Via POSTed JSON
@@ -202,7 +201,7 @@ class Job(JenkinsBase, MutableJenkinsThing):
             params=params,
             files=files,
         )
-        
+
         queue_url = response.headers['location']
         qi = QueueItem(queue_url, self.jenkins)
         return qi

diff --git a/jenkinsapi/queue.py b/jenkinsapi/queue.py
index 388697c4f0fd92d0012bf4a65ed2745da9baed60..22d517864bfbfa9c294fcd69371b4253c511e7b9 100644 (file)
--- a/jenkinsapi/queue.py
+++ b/jenkinsapi/queue.py
@@ -11,6 +11,7 @@ log = logging.getLogger(__name__)
 
 
 class Queue(JenkinsBase):
+
     """
     Class that represents the Jenkins queue
     """
@@ -64,13 +65,13 @@ class Queue(JenkinsBase):
         for item in self._data["items"]:
             if item['task']['name'] == job_name:
                 yield QueueItem(self.get_queue_item_url(item), jenkins_obj=self.jenkins)
-            
+
     def get_queue_items_for_job(self, job_name):
         return list(self._get_queue_items_for_job(job_name))
-    
+
     def get_queue_item_url(self, item):
         return "%s/item/%i" % (self.baseurl, item["id"])
-            
+
     def delete_item(self, queue_item):
         self.delete_item_by_id(queue_item.id)
 
@@ -80,17 +81,17 @@ class Queue(JenkinsBase):
 
 
 class QueueItem(JenkinsBase):
+
     """An individual item in the queue
     """
 
     def __init__(self, baseurl, jenkins_obj):
         self.jenkins = jenkins_obj
         JenkinsBase.__init__(self, baseurl)
-        
+
     @property
     def id(self):
         return self._data['id']
-        
 
     def get_jenkins_obj(self):
         return self.jenkins
@@ -117,18 +118,16 @@ class QueueItem(JenkinsBase):
 
     def __str__(self):
         return "%s Queue #%i" % (self._data['task']['name'], self._data['id'])
-    
+
     def get_build(self):
         build_number = self.get_build_number()
         job_name = self.get_job_name()
         return self.jenkins[job_name][build_number]
-    
-        
+
     def block_until_complete(self, delay=15):
         build = self.block_until_building(delay)
         return build.block_until_complete(delay=delay)
-            
-    
+
     def block_until_building(self, delay=5):
         while True:
             try:
@@ -136,8 +135,7 @@ class QueueItem(JenkinsBase):
             except NotBuiltYet:
                 time.sleep(delay)
                 continue
-    
-    
+
     def is_running(self):
         """Return True if this queued item is running.
         """
@@ -145,16 +143,15 @@ class QueueItem(JenkinsBase):
             return self.get_build().is_running()
         except NotBuiltYet:
             return False
-        
+
     def get_build_number(self):
         try:
             return self._data['executable']['number']
         except KeyError:
             raise NotBuiltYet()
-        
+
     def get_job_name(self):
         try:
             return self._data['task']['name']
         except KeyError:
             raise NotBuiltYet()
-            
\ No newline at end of file

diff --git a/jenkinsapi_tests/systests/test_jenkins.py b/jenkinsapi_tests/systests/test_jenkins.py
index 198dbf92087d320bbfb7908322eff9c88f6d1510..9614836b5afe32cb38cdb6ac1e9c51815c633893 100644 (file)
--- a/jenkinsapi_tests/systests/test_jenkins.py
+++ b/jenkinsapi_tests/systests/test_jenkins.py
@@ -8,7 +8,7 @@ except ImportError:
     import unittest
 from jenkinsapi.job import Job
 from jenkinsapi.plugin import Plugin
-from jenkinsapi.invocation import Invocation
+from jenkinsapi.queue import QueueItem
 from jenkinsapi_tests.systests.base import BaseSystemTest
 from jenkinsapi_tests.systests.job_configs import EMPTY_JOB
 from jenkinsapi_tests.test_utils.random_strings import random_string
@@ -56,7 +56,7 @@ class JobTests(BaseSystemTest):
         job_name = 'create_%s' % random_string()
         job = self.jenkins.create_job(job_name, EMPTY_JOB)
         ii = job.invoke()
-        self.assertIsInstance(ii, Invocation)
+        self.assertIsInstance(ii, QueueItem)
 
     def test_get_jobs_list(self):
         job1_name = 'first_%s' % random_string()