Fix python-psutil v2 issues caused by renaming foo to foo()

tracer/resources/applications.py

@@ -216,6 +216,6 @@ def helpers(self):
 
 	@property
 	def instances(self):
-		return Processes.all().filtered(lambda process: process.name == self.name)
+		return Processes.all().filtered(lambda process: process.name() == self.name)
 
 	affected_instances = None

tracer/resources/collections.py

@@ -62,7 +62,7 @@ class ProcessesCollection(Collection):
 	def owned_by(self, user):
 		if not user:
 			return self
-		return self.filtered(lambda process: process.username == user)
+		return self.filtered(lambda process: process.username() == user)
 
 	def newer_than(self, timestamp):
 		return self.filtered(lambda process: process.create_time() >= timestamp)

tracer/resources/processes.py

@@ -65,7 +65,7 @@ def files(self):
 
 	@property
 	def parent(self):
-		p = super(Process, self).parent
+		p = super(Process, self).parent()
 		if p:
 			p.__class__ = Process
 		return p
@@ -80,7 +80,7 @@ def get_children(self, recursive=False):
 	def exe(self):
 		# On Gentoo, there is #new after some files in lsof
 		# i.e. /usr/bin/gvim#new (deleted)
-		exe = super(Process, self).exe
+		exe = super(Process, self).exe()
 		if exe.endswith('#new'):
 			exe = exe[0:-4]
 

tracer/resources/system.py

@@ -68,5 +68,5 @@ def init_system():
 		"""
 
 		init = psutil.Process(1)
-		name = init.name.split(" ")[0]
+		name = init.name().split(" ")[0]
 		return name

tracer/resources/tracer.py

@@ -89,7 +89,7 @@ def trace_affected(self, user=None):
 					if p.create_time() <= package.modified:
 						found.append(p.pid)
 						p = self._apply_rules(p)
-						a = self._applications.find(p.name)
+						a = self._applications.find(p.name())
 
 						if a.name not in affected:
 							affected[a.name] = a
@@ -151,7 +151,7 @@ def _affecting_processes(self, process, packages):
 		return collection
 
 	def _affecting_children(self, process, packages):
-		if not self._rules.find(process.name):
+		if not self._rules.find(process.name()):
 			return {}
 
 		processes = AffectedProcessesCollection()

tracer/views/helper.py

@@ -21,7 +21,7 @@ def render(self):
 		for process in self.args.processes:
 			print indent + "{app_name} has been started by {user} {time} ago. PID - {pid}".format(
 					app_name=self.args.application.name,
-					user=process.username,
+					user=process.username(),
 					time=process.str_started_ago,
 					pid=process.pid
 			)
@@ -59,7 +59,7 @@ def render_affected_by(self):
 
 		for process in self.args.affected_by:
 			if process not in self.args.processes:
-				print indent_level * indent + "{0} ({1})".format(process.name, process.pid)
+				print indent_level * indent + "{0} ({1})".format(process.name(), process.pid)
 				indent_level += 1
 
 			for package in process.packages:

tracer/views/resource/processes.py

@@ -8,4 +8,4 @@ def render(self):
 		print 100 * "-"
 		# @FIXME sorting doesn't work correctly
 		for process in self.args.processes.sorted("create_time"):
-			print line.format(process.pid, process.str_started_ago, process.username, process.name)
+			print line.format(process.pid, process.str_started_ago, process.username(), process.name())