M listfix.py → listfix.py

@@ -3,11 +3,8 @@
 import sys
 import re
 import os
-
-sys.path.insert(1, sys.path[0] + "/mods")
-
-from listfixdb import ListfixDB
-from listfixemail import ListfixEmail
+from listfix.db import DB
+from listfix.email import Email
 
 ########################
 ## Function Defs
@@ -41,7 +38,7 @@
 ## Connect to DB (create DB if needed) and check tables.
 
 listfix_dir = os.path.dirname(os.path.realpath(__file__))
-db = ListfixDB(listfix_dir + "/listfix.sqlite3")
+db = DB(listfix_dir + "/listfix.sqlite3")
 
 ## Get command
 
@@ -67,7 +64,7 @@ content = []
     for line in sys.stdin:
         content.append(line)
 
-    email_in = ListfixEmail()
+    email_in = Email()
     email_in.set_content(content)
 
     if (email_in.is_auto_reply()):
@@ -79,7 +76,7 @@
     list_name = db.get_list_name(list_email)
     list_recipients = db.get_list_recipients(list_email)
 
-    email_out = ListfixEmail()
+    email_out = Email()
     email_out.set_content(email_in.get_content())
     email_out.strip_headers(exclude = ["To", "Cc", "Subject", "Content-[^:]+", "MIME-Version"])
     if (sender_email not in list_recipients):

A listfix/__init__.py

@@ -0,0 +1,1 @@
+# Dummy file to make this directory a package.

M mods/listfixdb.py → listfix/db.py

@@ -1,6 +1,6 @@
 import sqlite3
 
-class ListfixDB:
+class DB:
 
     def __init__(self, path):
         try:

M mods/listfixemail.py → listfix/email.py

@@ -7,7 +7,7 @@ re_email_parts = re.compile("(\S+)@(\S+\.\S+)")
 re_sender_info = re.compile("^From:\s+\"?([^<>\"]*?)\"?\s*<?(([^<>\"\s]+)@\S+\.[^<>\"\s]+)>?$")
 re_auto_reply = re.compile("^Auto-Submitted: (auto-generated|auto-replied)", re.IGNORECASE)
 
-class ListfixEmail:
+class Email:
 
     def __init__(self):
         self.content = []