Merge pull request #29 from ignatenkobrain/master

more psutil 2.x

requirements.txt

@@ -1,3 +1,3 @@
-psutil
+psutil >= 2.0.0
 BeautifulSoup4
 sphinx_rtd_theme

tracer.spec

@@ -19,7 +19,7 @@ BuildRequires:	python-sphinx
 BuildRequires:	libxslt
 Requires:	python
 Requires:	python-beautifulsoup4
-Requires:	python-psutil
+Requires:	python-psutil >= 2.0.0
 
 %description
 Tracer determines which applications use outdated files and prints them. For

tracer/controllers/resource.py

@@ -56,13 +56,13 @@ def render_processes(self):
 		view.render()
 
 	def render_packages(self):
-		timestamp = self.args.timestamp[0] if self.args.timestamp[0] else psutil.BOOT_TIME
+		timestamp = self.args.timestamp[0] if self.args.timestamp[0] else psutil.boot_time()
 		manager = System.package_manager()
 		packages = manager.packages_newer_than(timestamp)
 
 		view = PackagesView()
 		view.assign('packages', packages)
-		view.assign('boot_time', psutil.BOOT_TIME)
+		view.assign('boot_time', psutil.boot_time())
 		view.render()
 
 	def render_rules(self):
@@ -76,7 +76,7 @@ def render_applications(self):
 		view.render()
 
 	def render_system(self):
-		uptime = datetime.now() - datetime.fromtimestamp(psutil.BOOT_TIME)
+		uptime = datetime.now() - datetime.fromtimestamp(psutil.boot_time())
 		uptime = str(uptime).split('.')[0]
 
 		users = set([user.name for user in psutil.get_users()])

tracer/resources/processes.py

@@ -57,12 +57,7 @@ def files(self):
 			files.append(FilenameCleaner.strip(mmap.path))
 
 		# Process arguments
-		# this trick is for compatibility for 1.2.x psutil
-		try:
-			cmdline = self.cmdline()
-		except TypeError:
-			cmdline = self.cmdline
-		for arg in cmdline[1:]:
+		for arg in self.cmdline()[1:]:
 			if os.path.isfile(arg):
 				files.append(arg)
 

tracer/resources/tracer.py

@@ -59,7 +59,7 @@ def _modified_packages(self):
 		if self.specified_packages and self.now:
 			return self.specified_packages
 
-		timestamp = self.timestamp if self.timestamp else psutil.BOOT_TIME
+		timestamp = self.timestamp if self.timestamp else psutil.boot_time()
 		packages = self._PACKAGE_MANAGER.packages_newer_than(timestamp)
 		packages = packages.intersection(self.specified_packages)
 		return packages