diff options
| author | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-02-26 18:04:45 +0900 |
|---|---|---|
| committer | Yasuhito FUTATSUKI at POEM <futatuki@poem.co.jp> | 2016-02-26 18:04:45 +0900 |
| commit | b3e0912e4d982e53eccac906fad347e8f1792b97 (patch) | |
| tree | f5c1f7c97c5709c7db16fd2b777cca6b5848448a | |
| parent | 74500e4eadea5e441bcbd4ffe825c8729909f272 (diff) | |
| parent | a31d04a8b2bd1480cf774b00aeb8b1deb6469291 (diff) | |
| download | mailman2-b3e0912e4d982e53eccac906fad347e8f1792b97.tar.gz mailman2-b3e0912e4d982e53eccac906fad347e8f1792b97.tar.xz mailman2-b3e0912e4d982e53eccac906fad347e8f1792b97.zip | |
Merge lp:mailman/2.1 rev 1623
| -rw-r--r-- | Mailman/Utils.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Mailman/Utils.py b/Mailman/Utils.py index 8a54bfc5..682f5058 100644 --- a/Mailman/Utils.py +++ b/Mailman/Utils.py @@ -1178,12 +1178,12 @@ get_org_dom.""" url, e) return for line in d.readlines(): - if not line or line.startswith(' ') or line.startswith('//'): + if not line.strip() or line.startswith(' ') or line.startswith('//'): continue line = re.sub(' .*', '', line.strip()) if not line: continue - parts = line.split('.') + parts = line.lower().split('.') if parts[0].startswith('!'): exc = True parts = [parts[0][1:]] + parts[1:] @@ -1206,7 +1206,7 @@ Domain which may be the same as the input.""" if not s_dict: get_suffixes(mm_cfg.DMARC_ORGANIZATIONAL_DOMAIN_DATA_URL) hits = [] - d = domain.split('.') + d = domain.lower().split('.') d.reverse() for k in s_dict.keys(): ks = k.split('.') |