Merge pull request #323 from itkovian/fix-mail-connect-no-tls

wdpypere · web-flow · commit 326001d65eb6 · 2022-01-07T12:01:12.000+01:00
mail connect when no tls is used
diff --git a/bin/logdaemon.py b/bin/logdaemon.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright 2011-2021 Ghent University
+# Copyright 2011-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/__init__.py b/lib/vsc/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/__init__.py b/lib/vsc/utils/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/affinity.py b/lib/vsc/utils/affinity.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/dateandtime.py b/lib/vsc/utils/dateandtime.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/docs.py b/lib/vsc/utils/docs.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/exceptions.py b/lib/vsc/utils/exceptions.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/fancylogger.py b/lib/vsc/utils/fancylogger.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2021 Ghent University
+# Copyright 2011-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/generaloption.py b/lib/vsc/utils/generaloption.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2021 Ghent University
+# Copyright 2011-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/groups.py b/lib/vsc/utils/groups.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2018-2021 Ghent University
+# Copyright 2018-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/mail.py b/lib/vsc/utils/mail.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -115,6 +115,8 @@ def _connect(self):
             context = ssl.create_default_context()
             s.starttls(context=context)
             logging.debug("Started TLS connection")
+        else:
+            s.connect()
 
         if self.smtp_auth_user and self.smtp_auth_password:
             s.login(user=self.smtp_auth_user, password=self.smtp_auth_password)
diff --git a/lib/vsc/utils/missing.py b/lib/vsc/utils/missing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/patterns.py b/lib/vsc/utils/patterns.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/py2vs3/__init__.py b/lib/vsc/utils/py2vs3/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2020-2021 Ghent University
+# Copyright 2020-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/py2vs3/py2.py b/lib/vsc/utils/py2vs3/py2.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2020-2021 Ghent University
+# Copyright 2020-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/py2vs3/py3.py b/lib/vsc/utils/py2vs3/py3.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2020-2021 Ghent University
+# Copyright 2020-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/run.py b/lib/vsc/utils/run.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2009-2021 Ghent University
+# Copyright 2009-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/lib/vsc/utils/testing.py b/lib/vsc/utils/testing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
 ]
 
 PACKAGE = {
-    'version': '3.4.2',
+    'version': '3.4.3',
     'author': [sdw, jt, ag, kh],
     'maintainer': [sdw, jt, ag, kh],
     # as long as 1.0.0 is not out, vsc-base should still provide vsc.fancylogger
diff --git a/test/00-import.py b/test/00-import.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2021 Ghent University
+# Copyright 2016-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/__init__.py b/test/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/asyncprocess.py b/test/asyncprocess.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/dateandtime.py b/test/dateandtime.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/docs.py b/test/docs.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/exceptions.py b/test/exceptions.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2015-2021 Ghent University
+# Copyright 2015-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/fancylogger.py b/test/fancylogger.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2013-2021 Ghent University
+# Copyright 2013-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/generaloption.py b/test/generaloption.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/groups.py b/test/groups.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/mail.py b/test/mail.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/missing.py b/test/missing.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/optcomplete.py b/test/optcomplete.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2013-2021 Ghent University
+# Copyright 2013-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/py2vs3.py b/test/py2vs3.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2020-2021 Ghent University
+# Copyright 2020-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/rest.py b/test/rest.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/run.py b/test/run.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright 2012-2021 Ghent University
+# Copyright 2012-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/runtests/qa.py b/test/runtests/qa.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2021 Ghent University
+# Copyright 2016-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/runtests/simple.py b/test/runtests/simple.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2016-2021 Ghent University
+# Copyright 2016-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/runtests/simple_option.py b/test/runtests/simple_option.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2021 Ghent University
+# Copyright 2011-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/sandbox/testpkg/__init__.py b/test/sandbox/testpkg/__init__.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2021-2021 Ghent University
+# Copyright 2021-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
@@ -23,6 +23,5 @@
 # You should have received a copy of the GNU Library General Public License
 # along with vsc-base. If not, see <http://www.gnu.org/licenses/>.
 #
-#
 """
 """
diff --git a/test/sandbox/testpkg/testmodule.py b/test/sandbox/testpkg/testmodule.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/sandbox/testpkg/testmodulebis.py b/test/sandbox/testpkg/testmodulebis.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),
diff --git a/test/wrapper.py b/test/wrapper.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2014-2021 Ghent University
+# Copyright 2014-2022 Ghent University
 #
 # This file is part of vsc-base,
 # originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`	`#`
`3`		`-# Copyright 2011-2021 Ghent University`
	`3`	`+# Copyright 2011-2022 Ghent University`
`4`	`4`	`#`
`5`	`5`	`# This file is part of vsc-base,`
`6`	`6`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2015-2021 Ghent University`
	`2`	`+# Copyright 2015-2022 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-base,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2012-2021 Ghent University`
	`2`	`+# Copyright 2012-2022 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-base,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`#`
`2`		`-# Copyright 2018-2021 Ghent University`
	`2`	`+# Copyright 2018-2022 Ghent University`
`3`	`3`	`#`
`4`	`4`	`# This file is part of vsc-base,`
`5`	`5`	`# originally created by the HPC team of Ghent University (http://ugent.be/hpc/en),`