changeset 1004:191f440d11b4

core (constants): use realpath instead of abspath + do not import it when building libervia
author souliane <souliane@mailoo.org>
date Thu, 01 May 2014 11:14:25 +0200
parents 52ec79aa5bbe
children b4af31a8a4f2
files src/core/constants.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/core/constants.py	Wed Apr 30 19:54:21 2014 +0200
+++ b/src/core/constants.py	Thu May 01 11:14:25 2014 +0200
@@ -17,11 +17,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from os.path import expanduser, abspath
 try:
     import __pyjamas__  # do not import xdg when building Libervia
     BaseDirectory = None
 except ImportError:
+    from os.path import expanduser, realpath
     from xdg import BaseDirectory
 
 
@@ -62,7 +62,7 @@
         }
 
         # List of the configuration filenames sorted by ascending priority
-        CONFIG_FILES = [abspath(expanduser(path) + APP_NAME_FILE + '.conf') for path in
+        CONFIG_FILES = [realpath(expanduser(path) + APP_NAME_FILE + '.conf') for path in
                         ['/etc/', '~/', '~/.', '', '.'] +
                         ['%s/' % path for path in list(BaseDirectory.load_config_paths(APP_NAME_FILE))]
                        ]