[Pywps-commits] r673 - branches/pywps-3.0

[scm-commit@wald.intevation.org]

Author: jachym
Date: 2008-10-01 18:19:27 +0200 (Wed, 01 Oct 2008)
New Revision: 673

Modified:
   branches/pywps-3.0/wps.py
Log:
merged revision 672: bugfix in configuration loading

Modified: branches/pywps-3.0/wps.py
===================================================================
--- branches/pywps-3.0/wps.py	2008-10-01 16:18:11 UTC (rev 672)
+++ branches/pywps-3.0/wps.py	2008-10-01 16:19:27 UTC (rev 673)
@@ -175,8 +175,15 @@
 
         # configuration file as environment variable
         if os.getenv("PYWPS_CFG"):
-            cfgfiles = os.getenv("PYWPS_CFG")
 
+            # Windows or Unix
+            if sys.platform == 'win32':
+                cfgfiles = (os.path.join(self.workingDir,"pywps","default.cfg"),
+                        os.getenv("PYWPS_CFG"))
+            else:
+                cfgfiles = (os.path.join(pywps.__path__[0],"default.cfg"),
+                        os.getenv("PYWPS_CFG"))
+
         # try to eastimate the default location
         else:
             # Windows or Unix