convert CRLF to LF

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

diff --git a/rec10/trunk/src/configreader.py b/rec10/trunk/src/configreader.py
index b838c75..107f314 100644 (file)
--- a/rec10/trunk/src/configreader.py
+++ b/rec10/trunk/src/configreader.py
@@ -1,33 +1,33 @@
-#!/usr/bin/python\r
-# coding: UTF-8\r
-# Rec10 TS Recording Tools\r
-# Copyright (C) 2009-2011 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
-def getConfDVB(string):\r
-    global confp\r
-    return confp.get('dvb',string)\r
+#!/usr/bin/python
+# coding: UTF-8
+# Rec10 TS Recording Tools
+# Copyright (C) 2009-2011 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 getConfPath(string):
+    global confp
+    return confp.get('path', string)
+def getConfDB(string):
+    global confp
+    return confp.get('db', string)
+def getConfEnv(string):
+    global confp
+    return confp.get('env', string)
+def getConfLog(string):
+    global confp
+    return confp.get('log', string)
+def getConfDVB(string):
+    global confp
+    return confp.get('dvb',string)