diff --git a/pulsar/client/action_mapper.py b/pulsar/client/action_mapper.py
index 6d6985926dbc01cee6246ad482f64dcec262f8a5..122d4abd585185e709da76a5a4f3742640483fba 100644
--- a/pulsar/client/action_mapper.py
+++ b/pulsar/client/action_mapper.py
@@ -666,6 +666,7 @@ class RegexPathMapper(BasePathMapper):
     def to_dict(self):
         return self._extend_base_dict(path=self.pattern_raw)
 
+
 MAPPER_CLASSES = [PrefixPathMapper, GlobPathMapper, RegexPathMapper]
 MAPPER_CLASS_DICT = dict(map(lambda c: (c.match_type, c), MAPPER_CLASSES))
 
@@ -699,6 +700,7 @@ class FileLister(object):
                 depth -= 1
             return dict([(join(path, f), f) for f in directory_files(path)])
 
+
 DEFAULT_FILE_LISTER = FileLister(dict(depth=0))
 
 ACTION_CLASSES = [
@@ -714,10 +716,10 @@ ACTION_CLASSES = [
 actions = dict([(clazz.action_type, clazz) for clazz in ACTION_CLASSES])
 
 
-__all__ = [
+__all__ = (
     'FileActionMapper',
     'path_type',
     'from_dict',
     'MessageAction',
     'RemoteTransferAction',  # For testing
-]
+)
diff --git a/pulsar/client/config_util.py b/pulsar/client/config_util.py
index a128ca1dda35b02cfafccf2fca14c127883fdfea..37c45e886f6950801f68ac43bf20bc7571d12b4c 100644
--- a/pulsar/client/config_util.py
+++ b/pulsar/client/config_util.py
@@ -70,6 +70,7 @@ def __read_json(path):
     with open(path, "rb") as f:
         return json.load(reader(f))
 
+
 EXT_READERS = {
     CONFIG_TYPE_JSON: __read_json,
     CONFIG_TYPE_YAML: __read_yaml,
diff --git a/pulsar/client/manager.py b/pulsar/client/manager.py
index 459efa0905ab33a0c9e97469b17e65c28527d02c..3202d1a3cd8d67bce814d908e28aef8828a6c14d 100644
--- a/pulsar/client/manager.py
+++ b/pulsar/client/manager.py
@@ -298,8 +298,9 @@ def _environ_default_int(variable, default="0"):
         int_val = int(val)
     return int_val
 
-__all__ = [
+
+__all__ = (
     'ClientManager',
     'ObjectStoreClientManager',
-    'HttpPulsarInterface'
-]
+    'HttpPulsarInterface',
+)
diff --git a/pulsar/client/path_mapper.py b/pulsar/client/path_mapper.py
index 4ab8805b62a1eddeadb6fdebee898f9b581c841f..c3a3d58bb2ee5d3753ac0c338085ada242a57cf1 100644
--- a/pulsar/client/path_mapper.py
+++ b/pulsar/client/path_mapper.py
@@ -99,4 +99,5 @@ class PathMapper(object):
             message = "PathMapper cannot handle path type %s" % dataset_path_type
             raise Exception(message)
 
-__all__ = ['PathMapper']
+
+__all__ = ('PathMapper')
diff --git a/pulsar/client/staging/down.py b/pulsar/client/staging/down.py
index afdd1cec5c98cc14722dffa279ac625b40be4d2d..96e606f33baa3f99f5bbc02fa35d58ef8964ae6f 100644
--- a/pulsar/client/staging/down.py
+++ b/pulsar/client/staging/down.py
@@ -173,4 +173,5 @@ def _clean(collection_failure_exceptions, cleanup_job, client):
         except Exception:
             log.warn("Failed to cleanup remote Pulsar job")
 
-__all__ = ['finish_job']
+
+__all__ = ('finish_job')
diff --git a/pulsar/client/test/check.py b/pulsar/client/test/check.py
index c9b2f8ab1f86e4c43cc165abc99be67964877364..1fbb560d119485637ef5a392e1e05917b288cb22 100644
--- a/pulsar/client/test/check.py
+++ b/pulsar/client/test/check.py
@@ -481,5 +481,6 @@ def main(argv=None):
     (options, args) = parser.parse_args(argv)
     run(options)
 
+
 if __name__ == "__main__":
     main()
diff --git a/pulsar/client/transport/__init__.py b/pulsar/client/transport/__init__.py
index a1a0f7de74e96a872a5b8f94c163462264618e0d..a022c9719fc7f818980983e5d9ce7c7abde7982f 100644
--- a/pulsar/client/transport/__init__.py
+++ b/pulsar/client/transport/__init__.py
@@ -40,12 +40,13 @@ def _get_transport_type(transport_type, os_module):
             transport_type = 'curl'
     return transport_type
 
-__all__ = [
+
+__all__ = (
     'get_transport',
     'get_file',
     'post_file',
     'rsync_get_file',
     'rsync_post_file',
     'scp_get_file',
-    'scp_post_file'
-]
+    'scp_post_file',
+)
diff --git a/pulsar/main.py b/pulsar/main.py
index 56a596b54966d62b7fdca4bda0fa889332d1de39..eae928c5e06860f694070e3770b9a62247b94263 100644
--- a/pulsar/main.py
+++ b/pulsar/main.py
@@ -301,5 +301,6 @@ def main(argv=None):
     else:
         app_loop(args, log)
 
+
 if __name__ == "__main__":
     main()
diff --git a/pulsar/managers/base/base_drmaa.py b/pulsar/managers/base/base_drmaa.py
index 7358b482af7ace96ccb6b0642c030c3777c0ec7e..2f6fedd1798c8983b203bb693d5de58850d13ad1 100644
--- a/pulsar/managers/base/base_drmaa.py
+++ b/pulsar/managers/base/base_drmaa.py
@@ -77,4 +77,5 @@ class BaseDrmaaManager(ExternalBaseManager):
             log.debug("Not native specification supplied, DRMAA job will be submitted with default parameters.")
         return attributes
 
-__all__ = ["BaseDrmaaManager"]
+
+__all__ = ("BaseDrmaaManager")
diff --git a/pulsar/managers/staging/post.py b/pulsar/managers/staging/post.py
index 4edf8e4f74e88f13571ad42c68848c0c61be1953..7991a370bfb05fbeb992150154e41c0fdc875e47 100644
--- a/pulsar/managers/staging/post.py
+++ b/pulsar/managers/staging/post.py
@@ -69,4 +69,5 @@ def __pulsar_outputs(job_directory):
         metadata_directory_contents,
     )
 
-__all__ = ['postprocess']
+
+__all__ = ('postprocess')
diff --git a/pulsar/managers/staging/pre.py b/pulsar/managers/staging/pre.py
index 901008206162cb79050072181de79a01c411b454..5469615f09550afda5cec8a1e578d49c34b41e97 100644
--- a/pulsar/managers/staging/pre.py
+++ b/pulsar/managers/staging/pre.py
@@ -16,4 +16,5 @@ def preprocess(job_directory, setup_actions, action_executor):
         log.debug(description)
         action_executor.execute(lambda: action.write_to_path(path), "action[%s]" % description)
 
-__all__ = ['preprocess']
+
+__all__ = ('preprocess')
diff --git a/pulsar/managers/stateful.py b/pulsar/managers/stateful.py
index 1ced16890df9140e20cfb36f522f794709aea242..c16e34c54cdb76886fef4f9215ff04d2bb3c00c9 100644
--- a/pulsar/managers/stateful.py
+++ b/pulsar/managers/stateful.py
@@ -305,4 +305,5 @@ def new_thread_for_manager(manager, name, target, daemon):
     thread.start()
     return thread
 
-__all__ = ['StatefulManagerProxy']
+
+__all__ = ('StatefulManagerProxy')
diff --git a/pulsar/messaging/bind_amqp.py b/pulsar/messaging/bind_amqp.py
index b17c7e2441385768e7cef59a849dab64311c029d..3cc280bd199f9bc503940e6089f13736522445af 100644
--- a/pulsar/messaging/bind_amqp.py
+++ b/pulsar/messaging/bind_amqp.py
@@ -82,6 +82,7 @@ def __start_consumer(name, exchange, target):
     thread.start()
     return thread
 
+
 start_setup_consumer = functools.partial(__start_consumer, "setup")
 start_kill_consumer = functools.partial(__start_consumer, "kill")
 start_status_update_ack_consumer = functools.partial(__start_consumer, "status_update_ack")
diff --git a/pulsar/scripts/chown_working_directory.py b/pulsar/scripts/chown_working_directory.py
index 970e13ed38418029d7ec8495f73b5732a9552ff6..0e9b7abcf3ccce3777a12127dfd2d3fe1f62abed 100644
--- a/pulsar/scripts/chown_working_directory.py
+++ b/pulsar/scripts/chown_working_directory.py
@@ -32,5 +32,6 @@ def main(argv=None):
     command = "chown -R '%s' '%s'" % (user, job_directory)
     system(command)
 
+
 if __name__ == "__main__":
     main()
diff --git a/pulsar/scripts/drmaa_kill.py b/pulsar/scripts/drmaa_kill.py
index 6401afa246323a788ef96771955f1025343e1583..2e6915ba7575004085ec5ca077d964faabf12ee6 100644
--- a/pulsar/scripts/drmaa_kill.py
+++ b/pulsar/scripts/drmaa_kill.py
@@ -14,5 +14,6 @@ def main(argv=None):
     session = DrmaaSessionFactory().get()
     external_id = session.kill(external_id)
 
+
 if __name__ == "__main__":
     main()
diff --git a/pulsar/tools/authorization.py b/pulsar/tools/authorization.py
index 1a6a8bfbe08f6e7fe8a401bafc79c627cb8f6943..74cb967e43992c365fe496d5dbd599e68ad2a3de 100644
--- a/pulsar/tools/authorization.py
+++ b/pulsar/tools/authorization.py
@@ -87,4 +87,5 @@ def get_authorizer(toolbox):
         authorizer = AllowAnyAuthorizer()
     return authorizer
 
-__all__ = ['get_authorizer']
+
+__all__ = ('get_authorizer')
diff --git a/test/scripts_config_test.py b/test/scripts_config_test.py
index b4f95367866743468f729b444cec29d67cb753cf..64d7fafba749d33270c5ead223dd4d36ece4f570 100644
--- a/test/scripts_config_test.py
+++ b/test/scripts_config_test.py
@@ -131,6 +131,7 @@ def _check_project_directory(project_dir):
 
     return Project(ini_config, app_config)
 
+
 Project = collections.namedtuple('Project', ['ini_config', 'app_config'])
 
 
diff --git a/test/test_utils.py b/test/test_utils.py
index 238a830e7fd9b449feb587326eed1dd3a9492f44..a1498b61c5cfdcf57791c641f987cef8fb627724 100644
--- a/test/test_utils.py
+++ b/test/test_utils.py
@@ -54,6 +54,7 @@ def timed(timeout):
 
     return outer_wrapper
 
+
 INTEGRATION_MAXIMUM_TEST_TIME = 15
 integration_test = timed(INTEGRATION_MAXIMUM_TEST_TIME)