Skip to content

Commit 5cbd8c4

Browse files
committed
fixes #10
1 parent 4684066 commit 5cbd8c4

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

markdown_merge/core.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=
6666
# %% ../nbs/00_core.ipynb
6767
class MarkdownMerge:
6868
"Send templated email merge messages formatted with Markdown"
69-
def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None):
69+
def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None, env_from=None):
7070
self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0
7171
self.inserts = [{}]*len(addrs) if inserts is None else inserts
72-
self.smtp_cfg,self.test,self.hdrs = smtp_cfg,test,hdrs
72+
self.smtp_cfg,self.test,self.hdrs,self.env_from = smtp_cfg,test,hdrs,env_from
7373

7474
def send_msgs(self, pause=0.2):
7575
"Send all unsent messages to `addrs` with `pause` secs between each send"
@@ -80,7 +80,7 @@ def send_msgs(self, pause=0.2):
8080
eml = md2email(self.subj, self.from_addr, addr, md=msg, hdrs=self.hdrs)
8181
if self.test: print(f"To: {addr}\n{'-'*40}\n{msg}\n{'='*40}\n")
8282
else:
83-
conn.send_message(eml)
83+
conn.send_message(eml, from_addr=self.env_from)
8484
sleep(pause)
8585
self.i += 1
8686
if self.i%100==0:

nbs/00_core.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -387,10 +387,10 @@
387387
"#| export\n",
388388
"class MarkdownMerge:\n",
389389
" \"Send templated email merge messages formatted with Markdown\"\n",
390-
" def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None):\n",
390+
" def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None, env_from=None):\n",
391391
" self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0\n",
392392
" self.inserts = [{}]*len(addrs) if inserts is None else inserts\n",
393-
" self.smtp_cfg,self.test,self.hdrs = smtp_cfg,test,hdrs\n",
393+
" self.smtp_cfg,self.test,self.hdrs,self.env_from = smtp_cfg,test,hdrs,env_from\n",
394394
"\n",
395395
" def send_msgs(self, pause=0.2):\n",
396396
" \"Send all unsent messages to `addrs` with `pause` secs between each send\"\n",
@@ -401,7 +401,7 @@
401401
" eml = md2email(self.subj, self.from_addr, addr, md=msg, hdrs=self.hdrs)\n",
402402
" if self.test: print(f\"To: {addr}\\n{'-'*40}\\n{msg}\\n{'='*40}\\n\")\n",
403403
" else:\n",
404-
" conn.send_message(eml)\n",
404+
" conn.send_message(eml, from_addr=self.env_from)\n",
405405
" sleep(pause)\n",
406406
" self.i += 1\n",
407407
" if self.i%100==0:\n",

0 commit comments

Comments
 (0)