fix rename miss.

[rec10/rec10-git.git] / rec10 / trunk / src / configreader.py

diff --git a/rec10/trunk/src/configreader.py b/rec10/trunk/src/configreader.py
index ff66978..1ed6c4d 100644 (file)
--- a/rec10/trunk/src/configreader.py
+++ b/rec10/trunk/src/configreader.py
@@ -1,30 +1,30 @@
-#!/usr/bin/python
-# coding: UTF-8
-# Rec10 TS Recording Tools
-# Copyright (C) 2009-2010 Yukikaze
-import ConfigParser
-import os
-import os.path
-mypath = str(os.path.dirname(os.path.abspath(__file__)))
-confp = ConfigParser.SafeConfigParser()
-Conf = 'rec10.conf'
-confpath=""
-if os.path.exists(os.path.join(mypath,Conf)):
-    confpath=os.path.join(mypath,Conf)
-elif os.path.exists(os.path.join("/etc","rec10.conf")):
-    confpath=os.path.join("/etc","rec10.conf")
-elif os.path.exists(os.path.join("/etc/rec10","rec10.conf")):
-    confpath=os.path.join("/etc/rec10","rec10.conf")
-confp.read(confpath)
-def getPathSetting(string):
-    global confp
-    return confp.get('path', string)
-def getDBPathSetting(string):
-    global confp
-    return confp.get('db', string)
-def getEnvSetting(string):
-    global confp
-    return confp.get('env', string)
-def getLogSetting(string):
-    global confp
-    return confp.get('log', string)
+#!/usr/bin/python\r
+# coding: UTF-8\r
+# Rec10 TS Recording Tools\r
+# Copyright (C) 2009-2010 Yukikaze\r
+import ConfigParser\r
+import os\r
+import os.path\r
+mypath = str(os.path.dirname(os.path.abspath(__file__)))\r
+confp = ConfigParser.SafeConfigParser()\r
+Conf = 'rec10.conf'\r
+confpath=""\r
+if os.path.exists(os.path.join(mypath,Conf)):\r
+    confpath=os.path.join(mypath,Conf)\r
+elif os.path.exists(os.path.join("/etc","rec10.conf")):\r
+    confpath=os.path.join("/etc","rec10.conf")\r
+elif os.path.exists(os.path.join("/etc/rec10","rec10.conf")):\r
+    confpath=os.path.join("/etc/rec10","rec10.conf")\r
+confp.read(confpath)\r
+def getConfPath(string):\r
+    global confp\r
+    return confp.get('path', string)\r
+def getConfDB(string):\r
+    global confp\r
+    return confp.get('db', string)\r
+def getConfEnv(string):\r
+    global confp\r
+    return confp.get('env', string)\r
+def getConfLog(string):\r
+    global confp\r
+    return confp.get('log', string)\r