Use contextlib.closing around ftplib object

Signed-off-by: Jim Easterbrook <jim@jim-easterbrook.me.uk>

src/pywws/__init__.py

@@ -1,3 +1,3 @@
 __version__ = '18.8.0'
-_release = '1604'
-_commit = '3c6b504'
+_release = '1605'
+_commit = '71125a9'

src/pywws/service/ftp.py

@@ -56,7 +56,7 @@
 
 from __future__ import absolute_import
 
-from contextlib import contextmanager
+from contextlib import closing, contextmanager
 from datetime import timedelta
 import ftplib
 import logging
@@ -87,16 +87,12 @@ def __init__(self, context, check_params=True):
 
     @contextmanager
     def session(self):
-        logger.info("Uploading to web site with FTP")
-        session = ftplib.FTP()
-        session.connect(self.params['site'], self.params['port'])
-        logger.debug('welcome message\n' + session.getwelcome())
-        session.login(self.params['user'], self.params['password'])
-        session.cwd(self.params['directory'])
-        try:
+        with closing(ftplib.FTP()) as session:
+            session.connect(self.params['site'], self.params['port'])
+            logger.debug('welcome message\n' + session.getwelcome())
+            session.login(self.params['user'], self.params['password'])
+            session.cwd(self.params['directory'])
             yield session
-        finally:
-            session.close()
 
     def upload_file(self, session, path):
         target = os.path.basename(path)