Merge branch 'infoZettel'

infoZettelOrg/coronaZeit/tools/sendMail.py

@@ -5,11 +5,11 @@ from email import utils
 from email.mime.text import MIMEText
 from email.mime.multipart import MIMEMultipart
 import pypandoc
-import json
-import argparse
 import yaml
+import argparse
 from datetime import datetime
 import certifi
+import os
 
 def get_yaml(f):
 	'''Extracts the yamlHeader from a Markdown file'''
@@ -47,17 +47,9 @@ receiverEmails = [
 	"cwsvjudo@gmail.com",
 	"judo.cwsv@t-online.de",
 ]
-config = {
-	'smtp' : 
-	{
-		'serverAddress' : "mail.arcor.de",
-		'serverPort' : 465,
-		'login' : "cwsvjudo",
-		'password' : "***REMOVED***"
-	},
-	'senderEmailAddress': "cwsvjudo@arcor.de"
-}
-
+config = None 
+with open('./config.yaml', 'r') as file:
+	config = yaml.safe_load(file)
 
 if __name__=="__main__":
 	argv = argParser.parse_args()
@@ -76,7 +68,7 @@ if __name__=="__main__":
 	mdHeader =[]
 	mdText = []
 	with open(argv.mdFilePath) as f:
-		mdHeader = yaml.load(get_yaml(f))
+		mdHeader = yaml.safe_load(get_yaml(f))
 
 	# Create the plain-text and HTML version of your message
 	text = pypandoc.convert_file(argv.mdFilePath, "markdown", extra_args=["--self-contained", "--resource-path=../aufgaben"])