From: Andreas Monzner <andreas.monzner@multimedia-labs.de>
Date: Thu, 9 Oct 2008 20:29:51 +0000 (+0000)
Subject: use access for fileExits instead of try to open a file
X-Git-Tag: 2.6.0~783
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/e3c0ee4aa8e16c605cbd09e63b0ee14582680b0d

use access for fileExits instead of try to open a file
---

diff --git a/lib/python/Tools/Directories.py b/lib/python/Tools/Directories.py
index 8a35f1da..2b60924c 100644
--- a/lib/python/Tools/Directories.py
+++ b/lib/python/Tools/Directories.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from os import path as os_path, mkdir, rmdir, system, walk, stat as os_stat, listdir, readlink, makedirs, error as os_error, symlink
+from os import path as os_path, mkdir, rmdir, system, walk, stat as os_stat, listdir, readlink, makedirs, error as os_error, symlink, access, F_OK, R_OK, W_OK
 from stat import S_IMODE
 from re import compile
 
@@ -148,13 +148,13 @@ def removeDir(path):
 	return ret
 
 def fileExists(f, mode='r'):
-	try:
-		file = open(f, mode)
-	except IOError:
-		exists = 0
+	if mode == 'r':
+		acc_mode = R_OK
+	elif mode == 'w':
+		acc_mode = W_OK
 	else:
-		exists = 1
-	return exists
+		acc_mode = F_OK
+	return access(f, acc_mode)
 
 def getRecordingFilename(basename, dirname = None):
 	# filter out non-allowed characters