cleanup source

pyquarantine/__init__.py

@@ -31,6 +31,7 @@ from pyquarantine import storages
 from pyquarantine import whitelists
 
 __all__ = [
+    "make_header",
     "Quarantine",
     "QuarantineMilter",
     "setup_milter",
@@ -40,9 +41,10 @@ __all__ = [
     "notifications",
     "storages",
     "run",
-    "version",
     "whitelists"]
 
+__version__ = "1.0.6"
+
 
 def make_header(decoded_seq, maxlinelen=None, header_name=None,
                 continuation_ws=' ', errors='strict'):
@@ -342,7 +344,7 @@ class QuarantineMilter(Milter.Base):
             if quarantine.host_in_whitelist(hostaddr):
                 self.logger.debug(
                     f"host {hostaddr[0]} is in whitelist of "
-                    f"quarantine {quarantine['name']}")
+                    f"quarantine {quarantine.name}")
                 self.quarantines.remove(quarantine)
                 if not self.quarantines:
                     self.logger.debug(
@@ -384,7 +386,8 @@ class QuarantineMilter(Milter.Base):
             # write email header to memory buffer
             self.fp.write(f"{name}: {value}\r\n".encode(
                 encoding="ascii", errors="replace"))
-            value = str(make_header(decode_header(value), errors="replace"))
+            header = make_header(decode_header(value), errors="replace")
+            value = str(header).replace("\x00", "")
             self.logger.debug(
                 f"{self.qid}: decoded header: {name}: {value}")
             self.headers.append((name, value))

pyquarantine/cli.py

@@ -21,14 +21,14 @@ import sys
 import time
 
 from pyquarantine import QuarantineMilter, setup_milter
-from pyquarantine.version import __version__ as version
+from pyquarantine import __version__ as version
 
 
 def _get_quarantine(quarantines, name):
     try:
         quarantine = next((q for q in quarantines if q.name == name))
     except StopIteration:
-        raise RuntimeError(f"invalid quarantine 'name'")
+        raise RuntimeError("invalid quarantine 'name'")
     return quarantine
 
 

pyquarantine/notifications.py

@@ -212,7 +212,7 @@ class EMailNotification(BaseNotification):
                 raise RuntimeError(f"error reading image: {e}")
             else:
                 filename = basename(img_path)
-                img.add_header(f"Content-ID", f"<{filename}>")
+                img.add_header("Content-ID", f"<{filename}>")
                 self.embedded_imgs.append(img)
 
     def get_email_body_soup(self, qid, msg):

pyquarantine/run.py

@@ -22,7 +22,7 @@ import sys
 
 import pyquarantine
 
-from pyquarantine.version import __version__ as version
+from pyquarantine import __version__ as version
 
 
 def main():

pyquarantine/version.py

@@ -1 +0,0 @@
-__version__ = "1.0.4"

setup.cfg

@@ -0,0 +1,2 @@
+[metadata]
+version = attr: pyquarantine.__version__

setup.py

@@ -4,11 +4,8 @@ def read_file(fname):
     with open(fname, 'r') as f:
         return f.read()
 
-version = {}
-exec(read_file("pyquarantine/version.py"), version)
 
 setup(name = "pyquarantine",
-    version = version["__version__"],
     author = "Thomas Oettli",
     author_email = "spacefreak@noop.ch",
     description = "A pymilter based sendmail/postfix pre-queue filter.",