From 8f8d9dc1b668d1b4391b0e16f46db5cd41d43376 Mon Sep 17 00:00:00 2001 From: "Piotr F. Mieszkowski" Date: Sat, 22 Oct 2022 10:13:54 +0200 Subject: [PATCH] Rename mailgate.py to core.py --- gpg-mailgate.py | 6 +++--- lacre/{mailgate.py => core.py} | 0 lacre/daemon.py | 2 +- lacre/mailop.py | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) rename lacre/{mailgate.py => core.py} (100%) diff --git a/gpg-mailgate.py b/gpg-mailgate.py index 68b2eb1..57e1036 100755 --- a/gpg-mailgate.py +++ b/gpg-mailgate.py @@ -31,7 +31,7 @@ conf.load_config() lacre.init_logging(conf.get_item('logging', 'config')) # This has to be executed *after* logging initialisation. -import lacre.mailgate as mailgate +import lacre.core as core LOG = logging.getLogger(__name__) @@ -47,7 +47,7 @@ from_addr = raw_message['From'] to_addrs = sys.argv[1:] # Let's start -mailgate.deliver_message(raw_message, from_addr, to_addrs) -(elapsed_s, process_t) = mailgate.exec_time_info(start) +core.deliver_message(raw_message, from_addr, to_addrs) +(elapsed_s, process_t) = core.exec_time_info(start) LOG.info("Elapsed-time: {elapsed:.2f}s; Process-time: {process:.4f}s".format(elapsed=elapsed_s, process=process_t)) diff --git a/lacre/mailgate.py b/lacre/core.py similarity index 100% rename from lacre/mailgate.py rename to lacre/core.py diff --git a/lacre/daemon.py b/lacre/daemon.py index b400d79..e3fd850 100644 --- a/lacre/daemon.py +++ b/lacre/daemon.py @@ -24,7 +24,7 @@ conf.load_config() lacre.init_logging(conf.get_item("logging", "config")) LOG = logging.getLogger(__name__) -import lacre.mailgate as gate +import lacre.core as gate import lacre.keyring as kcache diff --git a/lacre/mailop.py b/lacre/mailop.py index ca24c7d..ec8d870 100644 --- a/lacre/mailop.py +++ b/lacre/mailop.py @@ -14,7 +14,7 @@ There are 3 operations available: """ import logging -import lacre.mailgate as mailgate +import lacre.core as core from email.message import Message @@ -72,9 +72,9 @@ class InlineOpenPGPEncrypt(OpenPGPEncrypt): def perform(self, msg: Message): """Encrypt with PGP Inline.""" LOG.debug('Sending PGP/Inline...') - return mailgate._gpg_encrypt_and_return(msg, + return core._gpg_encrypt_and_return(msg, self._keys, self._recipients, - mailgate._encrypt_all_payloads_inline) + core._encrypt_all_payloads_inline) class MimeOpenPGPEncrypt(OpenPGPEncrypt): @@ -87,9 +87,9 @@ class MimeOpenPGPEncrypt(OpenPGPEncrypt): def perform(self, msg: Message): """Encrypt with PGP MIME.""" LOG.debug('Sending PGP/MIME...') - return mailgate._gpg_encrypt_and_return(msg, + return core._gpg_encrypt_and_return(msg, self._keys, self._recipients, - mailgate._encrypt_all_payloads_mime) + core._encrypt_all_payloads_mime) class SMimeEncrypt(MailOperation):