Skip to content

Commit

Permalink
Merge pull request #435 from tlsfuzzer/py39-0.7
Browse files Browse the repository at this point in the history
Add testing on python 3.9 [0.7]
  • Loading branch information
tomato42 committed Nov 26, 2020
2 parents 5b253f7 + 026c509 commit acdde31
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 2 deletions.
4 changes: 4 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,10 @@ jobs:
dist: xenial
sudo: true
env: TACKPY=false
- python: 3.9
dist: xenial
sudo: true
env: TACKPY=false
- python: 2.7
env: TACKPY=true
- python: 3.4
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'Programming Language :: Python :: 3.6',
'Programming Language :: Python :: 3.7',
'Programming Language :: Python :: 3.8',
'Programming Language :: Python :: 3.9',
'Topic :: Security :: Cryptography',
'Topic :: Software Development :: Libraries :: Python Modules',
'Topic :: System :: Networking'
Expand Down
7 changes: 5 additions & 2 deletions tlslite/integration/imap4_tls.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ def __init__(self, host = '', port = IMAP4_TLS_PORT,

IMAP4.__init__(self, host, port)


def open(self, host = '', port = IMAP4_TLS_PORT):
# the `timeout` is a new argument in python3.9, so checks with
# older python versions will complain about unmatched parameters
# pylint: disable=arguments-differ
def open(self, host='', port=IMAP4_TLS_PORT, timeout=None):
"""Setup connection to remote server on "host:port".
This connection will be used by the routines:
Expand All @@ -96,3 +98,4 @@ def open(self, host = '', port = IMAP4_TLS_PORT):
self.sock = TLSConnection(self.sock)
ClientHelper._handshake(self, self.sock)
self.file = self.sock.makefile('rb')
# pylint: enable=arguments-differ

0 comments on commit acdde31

Please sign in to comment.