From 3df343495e2ac81d5ceb501b43240a68cbbca54c Mon Sep 17 00:00:00 2001
From: Peter Eckersley <pde@eff.org>
Date: Wed, 18 Jun 2014 10:58:53 -0700
Subject: [PATCH] Various fixups

---
 ConfigParser.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ConfigParser.py b/ConfigParser.py
index 85b704d93..4fb69b6b2 100755
--- a/ConfigParser.py
+++ b/ConfigParser.py
@@ -54,7 +54,7 @@ class Config:
             raise TypeError, domain + "'s policies should be a dict: " + `policies`
           self.tls_policies[domain] = {} # being here enforces TLS at all
           for policy, v in policies.items():
-            value = lower(str(v))
+            value = str(v).lower()
             if policy == "require-tls":
               if value in ("true", "1", "yes"):
                 self.tls_policies[domain]["required"] = True
@@ -64,6 +64,7 @@ class Config:
                 raise ValueError, "Unknown require-tls value " + `value`
             elif policy == "min-tls-version":
               reasonable = ["TLS", "TLSv1", "TLSv1.1", "TLSv1.2", "TLSv1.3"]
+              reasonable = map(string.lower, reasonable)
               if not value in reasonable:
                 raise ValueError, "Not a valid TLS version string: " + `value`
               self.tls_policies[domain]["min-tls-version"] = str(value)
@@ -76,7 +77,7 @@ class Config:
                 raise ValueError, "Not a known enoforcement policy " + `value`
       elif atr == "acceptable-mxs":
         self.acceptable_mxs = val
-        for domain, mxball in selg.acceptable_mxs:
+        for domain, mxball in self.acceptable_mxs.items():
           pass
       else:
         sys.stderr.write("Unknown attribute: " + `atr` + "\n")