[Mpuls-commits] r995 - in wasko/branches/2.0: . waskaweb/lib

[scm-commit@wald.intevation.org]

Author: bh
Date: 2010-01-28 19:17:47 +0100 (Thu, 28 Jan 2010)
New Revision: 995

Modified:
   wasko/branches/2.0/ChangeLog
   wasko/branches/2.0/waskaweb/lib/config.py
Log:
* waskaweb/lib/config.py (get_path): No need to treat an absolute
filename specially.  os.path.join already does the right thing.


Modified: wasko/branches/2.0/ChangeLog
===================================================================
--- wasko/branches/2.0/ChangeLog	2010-01-28 18:16:00 UTC (rev 994)
+++ wasko/branches/2.0/ChangeLog	2010-01-28 18:17:47 UTC (rev 995)
@@ -1,5 +1,10 @@
 2010-01-28  Bernhard Herzog  <bh at intevation.de>
 
+	* waskaweb/lib/config.py (get_path): No need to treat an absolute
+	filename specially.  os.path.join already does the right thing.
+
+2010-01-28  Bernhard Herzog  <bh at intevation.de>
+
 	* waskaweb/lib/config.py: Fix formatting.
 
 2010-01-28  Bernhard Herzog  <bh at intevation.de>

Modified: wasko/branches/2.0/waskaweb/lib/config.py
===================================================================
--- wasko/branches/2.0/waskaweb/lib/config.py	2010-01-28 18:16:00 UTC (rev 994)
+++ wasko/branches/2.0/waskaweb/lib/config.py	2010-01-28 18:17:47 UTC (rev 995)
@@ -25,8 +25,6 @@
 
 def get_path(dir, file):
     try:
-        if os.path.isabs(file):
-            return file
         return os.path.join(pylons.config.get('pylons.paths')
                             .get('static_files'), dir, file)
     except: