WIP: Address python linter complaints

api/examples/getvolfile.py

@@ -1,6 +1,8 @@
 #!/usr/bin/python3
+"""gfapi example for glfs_get_volfile()."""
 
 from __future__ import print_function
+
 import ctypes
 import ctypes.util
 
@@ -12,6 +14,7 @@
 
 
 def get_volfile(host, volume):
+    """Exercises glfs_get_volfile."""
     # This is set to a large value to exercise the "buffer not big enough"
     # path.  More realistically, you'd just start with a huge buffer.
     BUF_LEN = 0
@@ -30,6 +33,7 @@ def get_volfile(host, volume):
         return vlen
     return vbuf.value[:vlen]
 
+
 if __name__ == "__main__":
     import sys
 
@@ -42,4 +46,4 @@ def get_volfile(host, volume):
         for line in res.split('\n'):
             print(line)
     except:
-        print("bad return value %s" % res)
+        print(f"bad return value {res}")

events/eventskeygen.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+"""Events eventskeygen."""
 #
 #  Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com>
 #  This file is part of GlusterFS.
@@ -22,7 +23,7 @@
 # When adding new keys add it to the END
 keys = (
     # user driven events
-    #peer and volume management events
+    # peer and volume management events
     "EVENT_PEER_ATTACH",
     "EVENT_PEER_DETACH",
     "EVENT_VOLUME_CREATE",
@@ -35,7 +36,7 @@
     "EVENT_BRICK_RESET_COMMIT",
     "EVENT_BRICK_REPLACE",
 
-    #geo-rep events
+    # geo-rep events
     "EVENT_GEOREP_CREATE",
     "EVENT_GEOREP_START",
     "EVENT_GEOREP_STOP",
@@ -45,15 +46,15 @@
     "EVENT_GEOREP_CONFIG_SET",
     "EVENT_GEOREP_CONFIG_RESET",
 
-    #bitrot events
+    # bitrot events
     "EVENT_BITROT_ENABLE",
     "EVENT_BITROT_DISABLE",
     "EVENT_BITROT_SCRUB_THROTTLE",
     "EVENT_BITROT_SCRUB_FREQ",
     "EVENT_BITROT_SCRUB_OPTION",
     "EVENT_BITROT_SCRUB_ONDEMAND",
 
-    #quota events
+    # quota events
     "EVENT_QUOTA_ENABLE",
     "EVENT_QUOTA_DISABLE",
     "EVENT_QUOTA_SET_USAGE_LIMIT",
@@ -65,7 +66,7 @@
     "EVENT_QUOTA_HARD_TIMEOUT",
     "EVENT_QUOTA_DEFAULT_SOFT_LIMIT",
 
-    #snapshot events
+    # snapshot events
     "EVENT_SNAPSHOT_CREATED",
     "EVENT_SNAPSHOT_CREATE_FAILED",
     "EVENT_SNAPSHOT_ACTIVATED",
@@ -95,8 +96,8 @@
     "EVENT_SNAPSHOT_SCHEDULER_SCHEDULE_DELETED",
     "EVENT_SNAPSHOT_SCHEDULER_SCHEDULE_DELETE_FAILED",
 
-    #async events
-    #glusterd events
+    # async events
+    # glusterd events
     "EVENT_SVC_MANAGER_FAILED",
     "EVENT_SVC_RECONFIGURE_FAILED",
     "EVENT_SVC_CONNECTED",
@@ -123,38 +124,38 @@
     "EVENT_IMPORT_BRICK_FAILED",
     "EVENT_COMPARE_FRIEND_VOLUME_FAILED",
     "EVENT_NFS_GANESHA_EXPORT_FAILED",
-    #ec events
+    # ec events
     "EVENT_EC_MIN_BRICKS_NOT_UP",
     "EVENT_EC_MIN_BRICKS_UP",
-    #georep async events
+    # georep async events
     "EVENT_GEOREP_FAULTY",
     "EVENT_GEOREP_CHECKPOINT_COMPLETED",
     "EVENT_GEOREP_ACTIVE",
     "EVENT_GEOREP_PASSIVE",
 
-    #quota async events
+    # quota async events
     "EVENT_QUOTA_CROSSED_SOFT_LIMIT",
-    #bitrot async events
+    # bitrot async events
     "EVENT_BITROT_BAD_FILE",
-    #protocol-server events
+    # protocol-server events
     "EVENT_CLIENT_CONNECT",
     "EVENT_CLIENT_AUTH_REJECT",
     "EVENT_CLIENT_DISCONNECT",
-    #posix events
+    # posix events
     "EVENT_POSIX_SAME_GFID",
     "EVENT_POSIX_ALREADY_PART_OF_VOLUME",
     "EVENT_POSIX_BRICK_NOT_IN_VOLUME",
     "EVENT_POSIX_BRICK_VERIFICATION_FAILED",
     "EVENT_POSIX_ACL_NOT_SUPPORTED",
     "EVENT_POSIX_HEALTH_CHECK_FAILED",
-    #afr events
+    # afr events
     "EVENT_AFR_QUORUM_MET",
     "EVENT_AFR_QUORUM_FAIL",
     "EVENT_AFR_SUBVOL_UP",
     "EVENT_AFR_SUBVOLS_DOWN",
     "EVENT_AFR_SPLIT_BRAIN",
 
-    #tier events
+    # tier events
     "EVENT_TIER_ATTACH",
     "EVENT_TIER_ATTACH_FORCE",
     "EVENT_TIER_DETACH_START",
@@ -168,8 +169,8 @@
     "EVENT_TIER_WATERMARK_RAISED_TO_MID",
     "EVENT_TIER_WATERMARK_DROPPED_TO_LOW",
 
-    #dht events
-    #add/remove brick events
+    # dht events
+    # add/remove brick events
     "EVENT_VOLUME_ADD_BRICK",
     "EVENT_VOLUME_ADD_BRICK_FAILED",
     "EVENT_VOLUME_REMOVE_BRICK_START",
@@ -182,17 +183,17 @@
     "EVENT_VOLUME_REMOVE_BRICK_FORCE_FAILED",
     "EVENT_VOLUME_REMOVE_BRICK_FAILED",
 
-    #rebalance events
+    # rebalance events
     "EVENT_VOLUME_REBALANCE_START",
     "EVENT_VOLUME_REBALANCE_STOP",
     "EVENT_VOLUME_REBALANCE_FAILED",
     "EVENT_VOLUME_REBALANCE_COMPLETE",
 
-    #tier events
+    # tier events
     "EVENT_TIER_START",
     "EVENT_TIER_START_FORCE",
 
-    #brick/inodes events
+    # brick/inodes events
     "EVENT_DHT_DISK_USAGE",
     "EVENT_DHT_INODES_USAGE",
 )

events/src/eventsapiconf.py.in

@@ -12,21 +12,23 @@
 import subprocess
 glusterd_workdir = None
 
+
 # Methods
 def get_glusterd_workdir():
     global glusterd_workdir
     if glusterd_workdir is not None:
         return glusterd_workdir
     proc = subprocess.Popen(["gluster", "system::", "getwd"],
                             stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-                            universal_newlines = True)
+                            universal_newlines=True)
     out, err = proc.communicate()
     if proc.returncode == 0:
         glusterd_workdir = out.strip()
     else:
         glusterd_workdir = "@GLUSTERD_WORKDIR@"
     return glusterd_workdir
 
+
 SERVER_ADDRESS = "0.0.0.0"
 SERVER_ADDRESSv4 = "0.0.0.0"
 SERVER_ADDRESSv6 = "::1"

events/src/glustereventsd.py

@@ -1,5 +1,6 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
+"""Events glustereventsd."""
 #
 #  Copyright (c) 2016 Red Hat, Inc. <http://www.redhat.com>
 #  This file is part of GlusterFS.
@@ -11,31 +12,37 @@
 #
 
 from __future__ import print_function
-import sys
+
 import signal
+import sys
 import threading
+
 try:
     import socketserver
 except ImportError:
     import SocketServer as socketserver
+
 import socket
 from argparse import ArgumentParser, RawDescriptionHelpFormatter
-
 from eventtypes import all_events
+
 import handlers
 import utils
 from eventsapiconf import SERVER_ADDRESSv4, SERVER_ADDRESSv6, PID_FILE
 from eventsapiconf import AUTO_BOOL_ATTRIBUTES, AUTO_INT_ATTRIBUTES
 from utils import logger, PidFile, PidFileLockFailed, boolify
 
+
 # Subclass so that specifically IPv4 packets are captured
 class UDPServerv4(socketserver.ThreadingUDPServer):
     address_family = socket.AF_INET
 
+
 # Subclass so that specifically IPv6 packets are captured
 class UDPServerv6(socketserver.ThreadingUDPServer):
     address_family = socket.AF_INET6
 
+
 class GlusterEventsRequestHandler(socketserver.BaseRequestHandler):
 
     def handle(self):
@@ -114,24 +121,24 @@ def init_event_server():
     # Creating the Eventing Server, UDP Server for IPv4 packets
     try:
         serverv4 = UDPServerv4((SERVER_ADDRESSv4, port),
-                   GlusterEventsRequestHandler)
+                               GlusterEventsRequestHandler)
     except socket.error as e:
         sys.stderr.write("Failed to start Eventsd for IPv4: {0}\n".format(e))
         serverv4 = None
     if serverv4:
         server_thread1 = threading.Thread(target=UDP_server_thread,
-                         args=(serverv4,))
+                                          args=(serverv4,))
         server_thread1.start()
     # Creating the Eventing Server, UDP Server for IPv6 packets
     try:
         serverv6 = UDPServerv6((SERVER_ADDRESSv6, port),
-                   GlusterEventsRequestHandler)
+                               GlusterEventsRequestHandler)
     except socket.error as e:
         sys.stderr.write("Failed to start Eventsd for IPv6: {0}\n".format(e))
         serverv6 = None
     if serverv6:
         server_thread2 = threading.Thread(target=UDP_server_thread,
-                         args=(serverv6,))
+                                          args=(serverv6,))
         server_thread2.start()
     if serverv4 is None and serverv6 is None:
         sys.stderr.write("Failed to start Eventsd: {0}\n".format(e))