incubator-tashi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From strou...@apache.org
Subject svn commit: r1295385 - in /incubator/tashi/trunk/src/tashi/clustermanager/data: fromconfig.py getentoverride.py
Date Thu, 01 Mar 2012 02:40:26 GMT
Author: stroucki
Date: Thu Mar  1 02:40:25 2012
New Revision: 1295385

URL: http://svn.apache.org/viewvc?rev=1295385&view=rev
Log:
fromconfig, getentoverride: more pylint fixes. sigh.

Modified:
    incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py
    incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py

Modified: incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py?rev=1295385&r1=1295384&r2=1295385&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/data/fromconfig.py Thu Mar  1 02:40:25
2012
@@ -81,8 +81,8 @@ class FromConfig(DataInterface):
 	
 	def registerInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		self.acquireLock(self.instanceLock)
 		try:
@@ -114,8 +114,8 @@ class FromConfig(DataInterface):
 	
 	def releaseInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		try:
 			if (instance.id not in self.instances): # MPR: should never be true, but good to check
@@ -125,8 +125,8 @@ class FromConfig(DataInterface):
 	
 	def removeInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		self.acquireLock(self.instanceLock)
 		try:
@@ -137,8 +137,8 @@ class FromConfig(DataInterface):
 	
 	def acquireHost(self, hostId):
 		if type(hostId) is not int:
-                        self.log.exception("Argument is not of type int, but of type %s"
% (type(hostId)))
-                        raise TypeError
+			self.log.exception("Argument is not of type int, but of type %s" % (type(hostId)))
+			raise TypeError
 
 		self.hostLock.acquire()
 		host = self.hosts.get(hostId, None)
@@ -153,8 +153,8 @@ class FromConfig(DataInterface):
 	
 	def releaseHost(self, host):
 		if type(host) is not Host:
-                        self.log.exception("Argument is not of type Host, but of type %s"
% (type(host)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Host, but of type %s" % (type(host)))
+			raise TypeError
 
 		try:
 			if (host.id not in self.hosts): # MPR: should never be true, but good to check

Modified: incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py
URL: http://svn.apache.org/viewvc/incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py?rev=1295385&r1=1295384&r2=1295385&view=diff
==============================================================================
--- incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py (original)
+++ incubator/tashi/trunk/src/tashi/clustermanager/data/getentoverride.py Thu Mar  1 02:40:25
2012
@@ -36,8 +36,8 @@ class GetentOverride(DataInterface):
 	
 	def registerInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		return self.baseDataObject.registerInstance(instance)
 	
@@ -46,29 +46,29 @@ class GetentOverride(DataInterface):
 	
 	def releaseInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		return self.baseDataObject.releaseInstance(instance)
 	
 	def removeInstance(self, instance):
 		if type(instance) is not Instance:
-                        self.log.exception("Argument is not of type Instance, but of type
%s" % (type(instance)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Instance, but of type %s" % (type(instance)))
+			raise TypeError
 
 		return self.baseDataObject.removeInstance(instance)
 	
 	def acquireHost(self, hostId):
 		if type(hostId) is not int:
-                        self.log.exception("Argument is not of type int, but of type %s"
% (type(hostId)))
-                        raise TypeError
+			self.log.exception("Argument is not of type int, but of type %s" % (type(hostId)))
+			raise TypeError
 
 		return self.baseDataObject.acquireHost(hostId)
 	
 	def releaseHost(self, host):
 		if type(host) is not Instance:
-                        self.log.exception("Argument is not of type Host, but of type %s"
% (type(host)))
-                        raise TypeError
+			self.log.exception("Argument is not of type Host, but of type %s" % (type(host)))
+			raise TypeError
 
 		return self.baseDataObject.releaseHost(host)
 	



Mime
View raw message