From 5330047902e8fdde44fcf3af9284d6a55816d4e6 Mon Sep 17 00:00:00 2001
From: Stuart Gathman <stuart@gathman.org>
Date: Fri, 15 Mar 2013 23:04:38 +0000
Subject: [PATCH] Move many configs to datadir
---
Milter/config.py | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/Milter/config.py b/Milter/config.py
index 8f3c1cd..944d26c 100644
--- a/Milter/config.py
+++ b/Milter/config.py
@@ -1,4 +1,5 @@
from ConfigParser import ConfigParser
+import os.path
class MilterConfigParser(ConfigParser):
@@ -20,7 +21,7 @@ class MilterConfigParser(ConfigParser):
return [q.strip() for q in self.get(sect,opt).split(',')]
return []
- def getaddrset(self,sect,opt):
+ def getaddrset(self,sect,opt,dir=''):
if not self.has_option(sect,opt):
return {}
s = self.get(sect,opt)
@@ -29,13 +30,14 @@ class MilterConfigParser(ConfigParser):
q = q.strip()
if q.startswith('file:'):
domain = q[5:].lower()
- d[domain] = d.setdefault(domain,[]) + open(domain,'r').read().split()
+ fname = os.path.join(dir,domain)
+ d[domain] = d.setdefault(domain,[]) + open(fname,'r').read().split()
else:
user,domain = q.split('@')
d.setdefault(domain.lower(),[]).append(user)
return d
- def getaddrdict(self,sect,opt):
+ def getaddrdict(self,sect,opt,dir=''):
if not self.has_option(sect,opt):
return {}
d = {}
@@ -46,7 +48,7 @@ class MilterConfigParser(ConfigParser):
for addr in l.split(','):
addr = addr.strip()
if addr.startswith('file:'):
- fname = addr[5:]
+ fname = os.path.join(dir,addr[5:])
for a in open(fname,'r').read().split():
d[a] = q
else:
--
GitLab