From ed12151976fbce44b7c71e0437df2d4ca9b2b421 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Fri, 30 Sep 2016 00:03:14 +0100
Subject: [PATCH 1/3] Unused variable

---
 tools/archiver.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index d8efc5fc..5266bb6c 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -37,8 +37,6 @@
 
 """
 
-# Change this index name to whatever you picked!!
-indexname = "ponymail_alpha"
 logger = None
 
 from elasticsearch import Elasticsearch

From a49e36891b5b61174640d378005ebcee9eb90bd7 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Fri, 30 Sep 2016 00:06:03 +0100
Subject: [PATCH 2/3] Unused

---
 tools/archiver.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index 5266bb6c..b025af56 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -109,7 +109,6 @@ class Archiver(object):
     """ A mailman 3 archiver that forwards messages to pony mail. """
     if config.has_section('mailman') and config.has_option('mailman', 'plugin'):
         implementer(IArchiver)
-    name = "ponymail"
 
     # This is a list of the headers we're interested in publishing.
     keys = [

From 07ecb6584b4a54607f7c25f82ee344d458f56910 Mon Sep 17 00:00:00 2001
From: Sebb <sebb@apache.org>
Date: Fri, 30 Sep 2016 00:15:21 +0100
Subject: [PATCH 3/3] Simplify config handling; fetch generator style once

---
 tools/archiver.py | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/tools/archiver.py b/tools/archiver.py
index b025af56..6d116d58 100644
--- a/tools/archiver.py
+++ b/tools/archiver.py
@@ -73,6 +73,8 @@
 if config.has_option('elasticsearch', 'user'):
     auth = (config.get('elasticsearch','user'), config.get('elasticsearch','password'))
 
+archiver_generator = config.get("archiver", "generator", fallback="")
+
 def parse_attachment(part):
     cd = part.get("Content-Disposition", None)
     if cd:
@@ -130,7 +132,6 @@ class Archiver(object):
     def __init__(self, parseHTML=False):
         """ Just initialize ES. """
         global config, auth
-        ssl = False
         self.cropout = None
         self.html = parseHTML
         if parseHTML:
@@ -138,15 +139,12 @@ def __init__(self, parseHTML=False):
            self.html2text = html2text.html2text
         self.dbname = config.get("elasticsearch", "dbname")
         self.consistency = 'quorum'
-        if config.has_option("elasticsearch", "ssl") and config.get("elasticsearch", "ssl").lower() == 'true':
-            ssl = True
-        if config.has_option("elasticsearch", "write") and config.get("elasticsearch", "write") != "":
+        ssl = config.get("elasticsearch", "ssl", fallback="").lower() == 'true'
+        if config.get("elasticsearch", "write", fallback="") != "":
             self.consistency = config.get('elasticsearch', 'write')
-        if config.has_option("debug", "cropout") and config.get("debug", "cropout") != "":
+        if config.get("debug", "cropout", fallback="") != "":
             self.cropout = config.get("debug", "cropout")
-        uri = ""
-        if config.has_option("elasticsearch", "uri") and config.get("elasticsearch", "uri") != "":
-            uri = config.get("elasticsearch", "uri")
+        uri = config.get("elasticsearch", "uri", fallback="")
         dbs = [
             {
                 'host': config.get("elasticsearch", "hostname"),
@@ -156,8 +154,7 @@ def __init__(self, parseHTML=False):
                 'http_auth': auth
             }]
         # Backup ES?
-        if config.has_option("elasticsearch", "backup") and config.get("elasticsearch", "backup") != "":
-            backup = config.get("elasticsearch", "backup")
+        if config.get("elasticsearch", "backup", fallback="") != "":
             dbs.append(
                 {
                 'host': config.get("elasticsearch", "backup"),
@@ -296,9 +293,9 @@ def compute_updates(self, lid, private, msg):
             pmid = mid
             try:
                 # Use full message as bytes for mid?
-                if config.has_section('archiver') and config.has_option("archiver", "generator") and config.get("archiver", "generator") == "full":
+                if archiver_generator == "full":
                     mid = "%s@%s" % (hashlib.sha224(msg.as_bytes()).hexdigest(), lid)
-                elif config.has_section('archiver') and config.has_option("archiver", "generator") and config.get("archiver", "generator") == "medium":
+                elif archiver_generator == "medium":
                     xbody = body if type(body) is bytes else body.encode('ascii', 'ignore')
                     xbody += bytes(lid, encoding='ascii')
                     xbody += bytes(mdatestring, encoding='ascii')