diff --git a/LICENSE.md b/LICENSE.md index 861ec4b0..012f6103 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ ## The MIT License (MIT) -Copyright (c) 2020 Ian Good +Copyright (c) 2021 Ian Good Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/doc/source/conf.py b/doc/source/conf.py index a8f48143..4bee1ed7 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -22,7 +22,7 @@ # -- Project information ----------------------------------------------------- project = 'pymap' -copyright = '2020, Ian Good' +copyright = '2021, Ian Good' author = 'Ian Good' # The short X.Y version diff --git a/pymap/imap/__init__.py b/pymap/imap/__init__.py index 85612815..1e598a78 100644 --- a/pymap/imap/__init__.py +++ b/pymap/imap/__init__.py @@ -350,6 +350,12 @@ async def run(self, state: ConnectionState) -> None: """ await self._read_proxy_protocol() self._print('%s +++| %s', str(socket_info.get())) + try: + await self._run_state(state) + finally: + self._print('%s ---| %s', b'') + + async def _run_state(self, state: ConnectionState) -> None: bad_commands = 0 try: greeting = await self._exec(state.do_greeting()) @@ -420,9 +426,9 @@ async def run(self, state: ConnectionState) -> None: except ConnectionError: break except SSLError as exc: - self._print('%s <->| %s', f'') + self._print('%s <->| ', + exc.reason) return finally: await state.do_cleanup() current_command.reset(prev_cmd) - self._print('%s ---| %s', b'') diff --git a/setup.py b/setup.py index 5fa6590a..49af9ec4 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -# Copyright (c) 2020 Ian C. Good +# Copyright (c) 2021 Ian C. Good # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -28,7 +28,7 @@ license = f.read() setup(name='pymap', - version='0.25.0', + version='0.25.1', author='Ian Good', author_email='ian@icgood.net', description='Lightweight, asynchronous IMAP serving in Python.', @@ -50,7 +50,7 @@ packages=find_packages(), install_requires=[ 'pysasl ~= 0.8.0', - 'proxy-protocol ~= 0.7.0'], + 'proxy-protocol ~= 0.7.2'], extras_require={ 'admin': ['pymap-admin ~= 0.7.0', 'googleapis-common-protos'], 'macaroon': ['pymacaroons'],