pep8 tidyup and example of plugin querying
authorSalim Fadhley <sal@stodge.org>
Wed, 30 Jul 2014 00:14:29 +0000 (01:14 +0100)
committerSalim Fadhley <sal@stodge.org>
Wed, 30 Jul 2014 00:14:29 +0000 (01:14 +0100)
jenkinsapi/custom_exceptions.py
jenkinsapi/plugin.py
jenkinsapi/plugins.py
jenkinsapi/utils/krb_requester.py
jenkinsapi/utils/requester.py

index 1b323b67b475279132e746d9844cc60cd073dbe4..ce536fa8870b2455d4ae2cbee939646f4b61fd04 100644 (file)
@@ -51,12 +51,14 @@ class UnknownQueueItem(KeyError, NotFound):
     """
     pass
 
+
 class UnknownPlugin(KeyError, NotFound):
     """
     Jenkins does not recognize the plugin requested.
     """
     pass
 
+
 class NoBuildData(NotFound):
     """
     A job has no build data.
index df4384f071a6e1e157aef4d4edb8ea74d30a3e0d..2225ddeec01639500c993bf61ff46752b3f28b4b 100644 (file)
@@ -14,14 +14,13 @@ class Plugin(object):
 
     def __eq__(self, other):
         return self.__dict__ == other.__dict__
-    
+
     def __str__(self):
         return self.shortName
-    
+
     def __repr__(self):
         return "<%s.%s %s>" % (
             self.__class__.__module__,
             self.__class__.__name__,
             str(self)
         )
-        
index 996e291e0704d2a8f002c8e68870908b585c6213..a6c992be67f55ce6b2cc47cdab29a5a691ebfa72 100644 (file)
@@ -54,7 +54,7 @@ class Plugins(JenkinsBase):
             return self.get_plugins_dict()[plugin_name]
         except KeyError:
             raise UnknownPlugin(plugin_name)
-        
+
     def __contains__(self, plugin_name):
         """
         True if plugin_name is the name of a defined plugin
index 79fd77de0beb908aa11747ceb2b753cd6a5a295a..a9c4e7a89d459569aaa4813f50f52f948b327627 100644 (file)
@@ -4,8 +4,10 @@ Kerberos aware Requester
 from jenkinsapi.utils.requester import Requester
 from requests_kerberos import HTTPKerberosAuth, OPTIONAL
 
-#pylint: disable=W0222
+
+# pylint: disable=W0222
 class KrbRequester(Requester):
+
     """
     A class which carries out HTTP requests with Kerberos/GSSAPI authentication.
     """
index d7a994fcbe04b10dbd92742d84d8de2a00c0dcc2..e818f7a50589a8e4608395b166bd210863ebc318 100644 (file)
@@ -63,7 +63,7 @@ class Requester(object):
 
         requestKwargs['verify'] = self.ssl_verify
 
-        if not data is None:
+        if data:
             # It may seem odd, but some Jenkins operations require posting
             # an empty string.
             requestKwargs['data'] = data
@@ -112,7 +112,7 @@ class Requester(object):
             headers = {'Content-Type': 'application/x-www-form-urlencoded'}
 
         response = self.post_url(url, params, data, files, headers)
-        if not response.status_code in valid:
+        if response.status_code not in valid:
             raise JenkinsAPIException('Operation failed. url={0}, data={1}, headers={2}, status={3}, text={4}'.format(
                 response.url, data, headers, response.status_code, response.text.encode('UTF-8')))
         return response
@@ -120,7 +120,7 @@ class Requester(object):
     def get_and_confirm_status(self, url, params=None, headers=None, valid=None):
         valid = valid or self.VALID_STATUS_CODES
         response = self.get_url(url, params, headers)
-        if not response.status_code in valid:
+        if response.status_code not in valid:
             if response.status_code == 405:         # POST required
                 raise PostRequired('POST required for url {0}'.format(url))
             else: