Code formatting fixes

Author: pief

examples/simple_agent.py

@@ -67,7 +67,7 @@
 (options, args) = parser.parse_args()
 
 # Get terminal width for usage with pprint
-rows,columns = os.popen("stty size", "r").read().split()
+rows, columns = os.popen("stty size", "r").read().split()
 
 # First, create an instance of the netsnmpAgent class. We specify the
 # fully-qualified path to SIMPLE-MIB.txt ourselves here, so that you
@@ -86,59 +86,59 @@
 
 # Then we create all SNMP scalar variables we're willing to serve.
 simpleInteger = agent.Integer32(
-	oidstr = "SIMPLE-MIB::simpleInteger"
+	oidstr   = "SIMPLE-MIB::simpleInteger"
 )
 simpleIntegerContext1 = agent.Integer32(
-	oidstr = "SIMPLE-MIB::simpleInteger",
-	context = "context1",
-	initval = 200,
+	oidstr   = "SIMPLE-MIB::simpleInteger",
+	context  = "context1",
+	initval  = 200,
 )
 simpleIntegerRO = agent.Integer32(
 	oidstr   = "SIMPLE-MIB::simpleIntegerRO",
 	writable = False
 )
 simpleUnsigned = agent.Unsigned32(
-	oidstr = "SIMPLE-MIB::simpleUnsigned"
+	oidstr   = "SIMPLE-MIB::simpleUnsigned"
 )
 simpleUnsignedRO = agent.Unsigned32(
 	oidstr   = "SIMPLE-MIB::simpleUnsignedRO",
 	writable = False
 )
 simpleCounter32 = agent.Counter32(
-	oidstr = "SIMPLE-MIB::simpleCounter32"
+	oidstr   = "SIMPLE-MIB::simpleCounter32"
 )
 simpleCounter32Context2 = agent.Counter32(
-	oidstr = "SIMPLE-MIB::simpleCounter32",
-	context = "context2",
-	initval = pow(2,32) - 10, # To rule out endianness bugs
+	oidstr   = "SIMPLE-MIB::simpleCounter32",
+	context  = "context2",
+	initval  = pow(2,32) - 10, # To rule out endianness bugs
 )
 simpleCounter64 = agent.Counter64(
-	oidstr = "SIMPLE-MIB::simpleCounter64"
+	oidstr   = "SIMPLE-MIB::simpleCounter64"
 )
 simpleCounter64Context2 = agent.Counter64(
-	oidstr = "SIMPLE-MIB::simpleCounter64",
-	context = "context2",
-	initval = pow(2,64) - 10, # To rule out endianness bugs
+	oidstr   = "SIMPLE-MIB::simpleCounter64",
+	context  = "context2",
+	initval  = pow(2,64) - 10, # To rule out endianness bugs
 )
 simpleTimeTicks = agent.TimeTicks(
-	oidstr = "SIMPLE-MIB::simpleTimeTicks"
+	oidstr   = "SIMPLE-MIB::simpleTimeTicks"
 )
 simpleIpAddress = agent.IpAddress(
-	oidstr = "SIMPLE-MIB::simpleIpAddress",
-	initval="127.0.0.1"
+	oidstr   = "SIMPLE-MIB::simpleIpAddress",
+	initval  = "127.0.0.1"
 )
 simpleOctetString = agent.OctetString(
-	oidstr  = "SIMPLE-MIB::simpleOctetString",
-	initval = "Hello World"
+	oidstr   = "SIMPLE-MIB::simpleOctetString",
+	initval  = "Hello World"
 )
 simpleDisplayString = agent.DisplayString(
-	oidstr  = "SIMPLE-MIB::simpleDisplayString",
-	initval = "Nice to meet you"
+	oidstr   = "SIMPLE-MIB::simpleDisplayString",
+	initval  = "Nice to meet you"
 )
 
 # Create the first table
 firstTable = agent.Table(
-	oidstr = "SIMPLE-MIB::firstTable",
+	oidstr  = "SIMPLE-MIB::firstTable",
 	indexes = [
 		agent.DisplayString()
 	],
@@ -167,7 +167,7 @@
 
 # Create the second table
 secondTable = agent.Table(
-	oidstr = "SIMPLE-MIB::secondTable",
+	oidstr  = "SIMPLE-MIB::secondTable",
 	indexes = [
 		agent.Integer32()
 	],
@@ -192,11 +192,11 @@
 
 # Create the third table
 thirdTable = agent.Table(
-	oidstr = "SIMPLE-MIB::thirdTable",
-	indexes = [
+	oidstr     = "SIMPLE-MIB::thirdTable",
+	indexes    = [
 		agent.IpAddress()
 	],
-	columns = [
+	columns    = [
 		(2, agent.DisplayString("Broadcast")),
 		(3, agent.IpAddress("192.168.0.255"))
 	],

netsnmpagent.py

@@ -584,9 +584,9 @@ def IpAddress(self, initval = "0.0.0.0", oidstr = None, writable = True, context
 
 		class IpAddress(object):
 			def __init__(self):
-				self._flags = WATCHER_FIXED_SIZE
-				self._asntype = ASN_IPADDRESS
-				self._cvar = ctypes.c_uint(0)
+				self._flags     = WATCHER_FIXED_SIZE
+				self._asntype   = ASN_IPADDRESS
+				self._cvar      = ctypes.c_uint(0)
 				self._data_size = ctypes.sizeof(self._cvar)
 				self._max_size  = self._data_size
 				self.update(initval)
@@ -628,7 +628,7 @@ def cref(self, **kwargs):
 				# https://sourceforge.net/p/net-snmp/bugs/2136/) we have
 				# to convert the value to host byte order if it shall be
 				# used as table index.
-				if kwargs.get('is_table_index', False) == False:
+				if kwargs.get("is_table_index", False) == False:
 					return ctypes.byref(self._cvar)
 				else:
 					_cidx = ctypes.c_uint(0)
@@ -825,7 +825,7 @@ def value(self):
 
 					# Registered OID
 					rootoidlen = self._handler_reginfo.contents.rootoid_len
-					for i in range(0,rootoidlen):
+					for i in range(0, rootoidlen):
 						fulloid[i] = self._handler_reginfo.contents.rootoid[i]
 
 					# Entry
@@ -835,12 +835,12 @@ def value(self):
 					# table_data_set handlers, we do not have one here. No
 					# biggie, using a fixed value will do for our purposes as
 					# we'll do away with anything left of the last dot below.
-					fulloid[rootoidlen+1] = 2
+					fulloid[rootoidlen + 1] = 2
 
 					# Index data
 					indexoidlen = row.contents.index_oid_len
-					for i in range(0,indexoidlen):
-						fulloid[rootoidlen+2+i] = row.contents.index_oid[i]
+					for i in range(0, indexoidlen):
+						fulloid[rootoidlen + 2 + i] = row.contents.index_oid[i]
 
 					# Convert the full oid to its string representation
 					oidcstr = ctypes.create_string_buffer(MAX_OID_LEN)