PEP-8 corrections

Author: David Noble

splunklib/binding.py

@@ -25,11 +25,11 @@
 """
 
 import httplib
+import logging
 import socket
 import ssl
 import urllib
-import functools
-import logging
+
 from datetime import datetime
 from functools import wraps
 from StringIO import StringIO
@@ -64,6 +64,7 @@ def new_f(*args, **kwargs):
         return val
     return new_f
 
+
 # Singleton values to eschew None
 class _NoAuthenticationToken(object):
     """The value stored in a :class:`Context` or :class:`splunklib.client.Service`
@@ -79,6 +80,7 @@ class that is not logged in.
     """
     pass
 
+
 class UrlEncoded(str):
     """This class marks URL-encoded strings.
     It should be considered an SDK-private implementation detail.
@@ -240,10 +242,13 @@ def wrapper(self, *args, **kwargs):
                 # an AuthenticationError and give up.
                 with _handle_auth_error("Autologin failed."):
                     self.login()
-                with _handle_auth_error("Autologin succeeded, but there was an auth error on next request. Something's very wrong."):
+                with _handle_auth_error(
+                        "Autologin succeeded, but there was an auth error on "
+                        "next request. Something is very wrong."):
                     return request_fun()
             elif he.status == 401 and not self.autologin:
-                raise AuthenticationError("Request failed: Session is not logged in.", he)
+                raise AuthenticationError(
+                    "Request failed: Session is not logged in.", he)
             else:
                 raise
 
@@ -354,6 +359,7 @@ def namespace(sharing=None, owner=None, app=None, **kwargs):
         return record({'sharing': sharing, 'owner': owner, 'app': app})
     raise ValueError("Invalid value for argument: 'sharing'")
 
+
 class Context(object):
     """This class represents a context that encapsulates a splunkd connection.
 
@@ -827,6 +833,7 @@ def _abspath(self, path_segment,
                           skip_encode=skip_encode)
         return path
 
+
 def connect(**kwargs):
     """This function returns an authenticated :class:`Context` object.
 
@@ -1101,6 +1108,7 @@ def request(self, url, message, **kwargs):
             raise HTTPError(response)
         return response
 
+
 # Converts an httplib response into a file-like object.
 class ResponseReader(object):
     """This class provides a file-like interface for :class:`httplib` responses.
@@ -1156,6 +1164,7 @@ def read(self, size = None):
         r = r + self._response.read(size)
         return r
 
+
 def handler(key_file=None, cert_file=None, timeout=None):
     """This class returns an instance of the default HTTP request handler using
     the values you provide.

tests/test_job.py

@@ -232,13 +232,17 @@ def test_setpriority(self):
         # Note that you can only *decrease* the priority (i.e., 5 decreased to 3)
         # of a job unless Splunk is running as root. This is because Splunk jobs
         # are tied up with operating system processes and their priorities.
+
+        if self.service._splunk_version[0] < 6:
+            old_priority = int(self.job.content['priority'])
+            self.assertEqual(5, old_priority)
+
         new_priority = 3
         self.job.set_priority(new_priority)
 
-        while not self.job.is_ready():
-            pass
-
-        self.assertEqual(5, int(self.job.content['priority']))
+        if self.service._splunk_version[0] >= 6:
+            while not self.job.is_ready():
+                pass
 
         def f():
             if self.job.is_done():
@@ -283,7 +287,6 @@ def test_pause(self):
             self.job.unpause()
             self.job.refresh()
             self.assertEqual(self.job['isPaused'], '0')
-
         self.job.pause()
         self.assertEventuallyTrue(lambda: self.job.refresh()['isPaused'] == '1')