treat pylint warnings

osc/checker.py

@@ -7,96 +7,95 @@ import rpm
 import base64
 
 class KeyError(Exception):
-	def __init__(self, key, *args):
-		Exception.__init__(self)
-		self.args = args
-		self.key = key
-	def __str__(self):
-		return ''+self.key+' :'+' '.join(self.args)
+    def __init__(self, key, *args):
+        Exception.__init__(self)
+        self.args = args
+        self.key = key
+    def __str__(self):
+        return ''+self.key+' :'+' '.join(self.args)
 
 class Checker:
-	def __init__(self):
-		self.dbdir = mkdtemp(prefix='oscrpmdb')
-		self.imported = {}
-		rpm.addMacro('_dbpath', self.dbdir)
-		self.ts = rpm.TransactionSet()
-		self.ts.initDB()
-		self.ts.openDB()
-		self.ts.setVSFlags(0)
-		#self.ts.Debug(1)
+    def __init__(self):
+        self.dbdir = mkdtemp(prefix='oscrpmdb')
+        self.imported = {}
+        rpm.addMacro('_dbpath', self.dbdir)
+        self.ts = rpm.TransactionSet()
+        self.ts.initDB()
+        self.ts.openDB()
+        self.ts.setVSFlags(0)
+        #self.ts.Debug(1)
 
-	def readkeys(self, keys=[]):
-		rpm.addMacro('_dbpath', self.dbdir)
-		for key in keys:
-			self.readkey(key)
+    def readkeys(self, keys=[]):
+        rpm.addMacro('_dbpath', self.dbdir)
+        for key in keys:
+            self.readkey(key)
 
-		rpm.delMacro("_dbpath")
+        rpm.delMacro("_dbpath")
 
 # python is an idiot
-#	def __del__(self):
-#		self.cleanup()
+#    def __del__(self):
+#        self.cleanup()
 
-	def cleanup(self):
-		self.ts.closeDB()
-		rmtree(self.dbdir)
+    def cleanup(self):
+        self.ts.closeDB()
+        rmtree(self.dbdir)
 
-	def readkey(self, file):
-		if file in self.imported:
-			return
+    def readkey(self, file):
+        if file in self.imported:
+            return
 
-		fd = open(file, "r")
-		line = fd.readline()
-		if line and line[0:14] == "-----BEGIN PGP":
-			line = fd.readline()
-			while line and line != "\n":
-				line = fd.readline()
-			if not line:
-				raise KeyError(file, "not a pgp public key")
-		else:
-			raise KeyError(file, "not a pgp public key")
-			
-		key = ''
-		line = fd.readline()
-		while line:
-			if line[0:12] == "-----END PGP":
-				break
-			line = line.rstrip()
-			key += line
-			line = fd.readline()
-		fd.close()
-		if not line or line[0:12] != "-----END PGP":
-			raise KeyError(file, "not a pgp public key")
+        fd = open(file, "r")
+        line = fd.readline()
+        if line and line[0:14] == "-----BEGIN PGP":
+            line = fd.readline()
+            while line and line != "\n":
+                line = fd.readline()
+            if not line:
+                raise KeyError(file, "not a pgp public key")
+        else:
+            raise KeyError(file, "not a pgp public key")
 
-		bkey = base64.b64decode(key)
+        key = ''
+        line = fd.readline()
+        while line:
+            if line[0:12] == "-----END PGP":
+                break
+            line = line.rstrip()
+            key += line
+            line = fd.readline()
+        fd.close()
+        if not line or line[0:12] != "-----END PGP":
+            raise KeyError(file, "not a pgp public key")
 
-		r = self.ts.pgpImportPubkey(bkey)
-		if r != 0:
-			raise KeyError(file, "failed to import pubkey")
-		self.imported[file] = 1
+        bkey = base64.b64decode(key)
 
-	def check(self, pkg):
-		fd = os.open(pkg, os.O_RDONLY)
-		hdr = self.ts.hdrFromFdno(fd)
-		os.close(fd)
+        r = self.ts.pgpImportPubkey(bkey)
+        if r != 0:
+            raise KeyError(file, "failed to import pubkey")
+        self.imported[file] = 1
+
+    def check(self, pkg):
+        fd = os.open(pkg, os.O_RDONLY)
+        hdr = self.ts.hdrFromFdno(fd)
+        os.close(fd)
 
 if __name__ == "__main__":
-	import sys
-	keyfiles = []
-	pkgs = []
-	for arg in sys.argv[1:]:
-		if arg[-4:] == '.rpm':
-			pkgs.append(arg)
-		else:
-			keyfiles.append(arg)
-
-	checker = Checker()
-	try:
-		checker.readkeys(keyfiles)
-		for pkg in pkgs:
-			checker.check(pkg)
-	except Exception, e:
-		checker.cleanup()
-		raise e
+    import sys
+    keyfiles = []
+    pkgs = []
+    for arg in sys.argv[1:]:
+        if arg[-4:] == '.rpm':
+            pkgs.append(arg)
+        else:
+            keyfiles.append(arg)
 
+    checker = Checker()
+    try:
+        checker.readkeys(keyfiles)
+        for pkg in pkgs:
+            checker.check(pkg)
+    except Exception, e:
+        checker.cleanup()
+        raise e
 
 # vim: sw=4 et