Improve some stuff

nullsmtpd/nullsmtpd.py

@@ -17,7 +17,7 @@
 
 
 # pylint: disable=too-few-public-methods
-class NullSMTPDHandler(object):
+class NullSMTPDHandler:
     """
     Handler for aiosmtpd module. This handler upon receiving a message will write the message
     to a file (as well as potentially logging the message if output_messages is True) instead
@@ -37,7 +37,7 @@ def __init__(self, logger, mail_dir, output_messages=True):
             msg = "Invalid mail_dir variable: {}".format(mail_dir)
             self.logger.error(msg)
             raise SystemExit(msg)
-        elif not os.path.isdir(mail_dir):
+        if not os.path.isdir(mail_dir):
             try:
                 os.mkdir(mail_dir)
             except IOError as io_error:
@@ -111,8 +111,8 @@ def main():
 
     if args.no_fork is not True:
         pid = os.fork()
-        if pid is not 0:
-            raise SystemExit()
+        if pid != 0:
+            raise SystemExit("Could not fork nullsmtpd")
 
     host = args.host
     port = args.port

setup.py

@@ -1,18 +1,7 @@
-"""
-Setup file for nullsmtpd
-"""
-import os
-import pwd
+"""Setup file for nullsmtpd."""
 from setuptools import setup
 from nullsmtpd.version import __author__, __version__
 
-# If we're not running as root, or the /etc/init.d folder doesn't exist, don't bother copying
-# in our services file for NullSMTP
-# pylint: disable=invalid-name
-#if pwd.getpwnam("root").pw_uid != os.getuid() or not os.path.isdir(os.path.join("etc", "init.d")):
-#    data_files = []
-#else:
-#    data_files = [('/etc/init.d', ['init.d/nullsmtpd'])]
 
 setup(name='nullsmtpd',
       version=__version__,
@@ -41,5 +30,4 @@
               'nullsmtpd = nullsmtpd.nullsmtpd:main',
           ]
       },
-      # data_files=data_files,
       install_requires=['aiosmtpd'])