Skip to content

Commit e5722d5

Browse files
authored
Merge pull request #500 from tlsfuzzer/py3.12
Py3.12
2 parents 78430db + a9bd0a7 commit e5722d5

File tree

3 files changed

+33
-2
lines changed

3 files changed

+33
-2
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ jobs:
3737
- name: py3.10
3838
os: ubuntu-latest
3939
python-version: '3.10'
40+
- name: py3.11
41+
os: ubuntu-latest
42+
python-version: '3.11'
43+
- name: py3.12
44+
os: ubuntu-latest
45+
python-version: '3.12.0-beta.4'
4046
- name: py2.6
4147
os: ubuntu-latest
4248
container: centos:6
@@ -70,6 +76,10 @@ jobs:
7076
os: ubuntu-latest
7177
python-version: '3.10'
7278
opt-deps: ['m2crypto']
79+
- name: py3.11 with m2crypto
80+
os: ubuntu-latest
81+
python-version: '3.11'
82+
opt-deps: ['m2crypto']
7383
- name: py2.7 with pycrypto
7484
os: ubuntu-20.04
7585
python-version: 2.7
@@ -107,6 +117,7 @@ jobs:
107117
opt-deps: ['gmpy']
108118
- name: py3.10 with gmpy
109119
os: ubuntu-latest
120+
# 3.10 is the last version gmpy builds with
110121
python-version: '3.10'
111122
opt-deps: ['gmpy']
112123
- name: py2.7 with gmpy2
@@ -133,6 +144,10 @@ jobs:
133144
os: ubuntu-latest
134145
python-version: '3.10'
135146
opt-deps: ['gmpy2']
147+
- name: py3.11 with gmpy2
148+
os: ubuntu-latest
149+
python-version: '3.11'
150+
opt-deps: ['gmpy2']
136151
# finally test with multiple dependencies installed at the same time
137152
- name: py2.7 with m2crypto, pycrypto, gmpy, and gmpy2
138153
os: ubuntu-20.04
@@ -157,8 +172,13 @@ jobs:
157172
- name: py3.10 with m2crypto, gmpy, and gmpy2
158173
os: ubuntu-latest
159174
python-version: '3.10'
175+
opt-deps: ['m2crypto', 'gmpy', 'gmpy2']
176+
- name: py3.11 with m2crypto, gmpy, and gmpy2
177+
os: ubuntu-latest
178+
python-version: '3.11'
179+
# gmpy doesn't build with 3.11
160180
# coverage to codeclimate can be submitted just once
161-
opt-deps: ['m2crypto', 'gmpy', 'gmpy2', 'codeclimate']
181+
opt-deps: ['m2crypto', 'gmpy2', 'codeclimate']
162182
steps:
163183
- uses: actions/checkout@v2
164184
if: ${{ !matrix.container }}

setup.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
'Programming Language :: Python :: 3.7',
4141
'Programming Language :: Python :: 3.8',
4242
'Programming Language :: Python :: 3.9',
43+
'Programming Language :: Python :: 3.10',
44+
'Programming Language :: Python :: 3.11',
45+
'Programming Language :: Python :: 3.12',
4346
'Topic :: Security :: Cryptography',
4447
'Topic :: Software Development :: Libraries :: Python Modules',
4548
'Topic :: System :: Networking'

tlslite/api.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
# See the LICENSE file for legal information regarding use of this file.
33

44
__version__ = "0.8.0-alpha45"
5+
# the whole module is about importing most commonly used methods, for use
6+
# by other applications
7+
# pylint: disable=unused-import
58
from .constants import AlertLevel, AlertDescription, Fault
69
from .errors import *
710
from .checker import Checker
@@ -15,7 +18,12 @@
1518

1619
from .integration.httptlsconnection import HTTPTLSConnection
1720
from .integration.tlssocketservermixin import TLSSocketServerMixIn
18-
from .integration.tlsasyncdispatchermixin import TLSAsyncDispatcherMixIn
21+
try:
22+
from .integration.tlsasyncdispatchermixin import TLSAsyncDispatcherMixIn
23+
except ModuleNotFoundError:
24+
# asyncore was removed in 3.12, I don't use use it, so don't know how
25+
# to fix it
26+
pass
1927
from .integration.pop3_tls import POP3_TLS
2028
from .integration.imap4_tls import IMAP4_TLS
2129
from .integration.smtp_tls import SMTP_TLS

0 commit comments

Comments
 (0)