Skip to content

Commit 8141a31

Browse files
committed
workaround Sphinx bug with ivar references
sphinx-doc/sphinx#2549
1 parent 9396ca0 commit 8141a31

File tree

5 files changed

+37
-37
lines changed

5 files changed

+37
-37
lines changed

tlslite/extensions.py

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ class TLSExtension(object):
5151
:ivar extType: a 2^16-1 limited integer specifying the type of the
5252
extension that it contains, e.g. 0 indicates server name extension
5353
54-
:vartype extData: bytearray
55-
:ivar extData: a byte array containing the value of the extension as
54+
:vartype ~.extData: bytearray
55+
:ivar ~.extData: a byte array containing the value of the extension as
5656
to be written on the wire
5757
5858
:vartype serverType: boolean
@@ -669,8 +669,8 @@ class SNIExtension(TLSExtension):
669669
:vartype extType: int
670670
:ivar extType: numeric type of SNIExtension, i.e. 0
671671
672-
:vartype extData: bytearray
673-
:ivar extData: raw representation of the extension
672+
:vartype ~.extData: bytearray
673+
:ivar ~.extData: raw representation of the extension
674674
"""
675675

676676
ServerName = namedtuple('ServerName', 'name_type name')
@@ -853,8 +853,8 @@ class SupportedVersionsExtension(VarSeqListExtension):
853853
:vartype extType: int
854854
:ivar extType: numeric type of the Supported Versions extension, i.e. 43
855855
856-
:vartype extData: bytearray
857-
:ivar extData: raw representation of the extension data
856+
:vartype ~.extData: bytearray
857+
:ivar ~.extData: raw representation of the extension data
858858
859859
:vartype versions: list of tuples
860860
:ivar versions: list of supported protocol versions; each tuple has two
@@ -878,11 +878,11 @@ class SrvSupportedVersionsExtension(TLSExtension):
878878
:vartype extType: int
879879
:ivar extType: numeric type of the Supported Versions extension, i.e. 43
880880
881-
:vartype extData: bytearray
882-
:ivar extData: raw representation of the extension payload
881+
:vartype ~.extData: bytearray
882+
:ivar ~.extData: raw representation of the extension payload
883883
884-
:vartype version: tuple
885-
:ivar version: version selected by the server
884+
:vartype ~.version: tuple
885+
:ivar ~.version: version selected by the server
886886
"""
887887

888888
def __init__(self):
@@ -950,8 +950,8 @@ class ClientCertTypeExtension(VarListExtension):
950950
:vartype extType: int
951951
:ivar extType: numeric type of Certificate Type extension, i.e. 9
952952
953-
:vartype extData: bytearray
954-
:ivar extData: raw representation of the extension data
953+
:vartype ~.extData: bytearray
954+
:ivar ~.extData: raw representation of the extension data
955955
956956
:vartype certTypes: list of int
957957
:ivar certTypes: list of certificate type identifiers (each one byte long)
@@ -977,8 +977,8 @@ class ServerCertTypeExtension(IntExtension):
977977
:vartype extType: int
978978
:ivar extType: binary type of Certificate Type extension, i.e. 9
979979
980-
:vartype extData: bytearray
981-
:ivar extData: raw representation of the extension data
980+
:vartype ~.extData: bytearray
981+
:ivar ~.extData: raw representation of the extension data
982982
983983
:vartype cert_type: int
984984
:ivar cert_type: the certificate type selected by server
@@ -1014,8 +1014,8 @@ class SRPExtension(TLSExtension):
10141014
:vartype extType: int
10151015
:ivar extType: numeric type of SRPExtension, i.e. 12
10161016
1017-
:vartype extData: bytearray
1018-
:ivar extData: raw representation of extension data
1017+
:vartype ~.extData: bytearray
1018+
:ivar ~.extData: raw representation of extension data
10191019
10201020
:vartype identity: bytearray
10211021
:ivar identity: UTF-8 encoding of user name
@@ -1101,8 +1101,8 @@ class NPNExtension(TLSExtension):
11011101
:vartype extType: int
11021102
:ivar extType: numeric type of NPNExtension, i.e. 13172
11031103
1104-
:vartype extData: bytearray
1105-
:ivar extData: raw representation of extension data
1104+
:vartype ~.extData: bytearray
1105+
:ivar ~.extData: raw representation of extension data
11061106
"""
11071107

11081108
def __init__(self):
@@ -1527,8 +1527,8 @@ class ALPNExtension(TLSExtension):
15271527
:vartype extType: int
15281528
:ivar extType: numberic type of ALPNExtension, i.e. 16
15291529
1530-
:vartype extData: bytearray
1531-
:ivar extData: raw encoding of the extension data
1530+
:vartype ~.extData: bytearray
1531+
:var ~.extData: raw encoding of the extension data
15321532
"""
15331533

15341534
def __init__(self):

tlslite/messages.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -318,14 +318,14 @@ class ClientHello(HelloMessage):
318318
:vartype srp_username: bytearray
319319
:ivar srp_username: name of the user in SRP extension (deprecated)
320320
321-
:vartype supports_npn: boolean
322-
:ivar supports_npn: NPN extension presence (deprecated)
321+
:vartype ~.supports_npn: boolean
322+
:ivar ~.supports_npn: NPN extension presence (deprecated)
323323
324-
:vartype tack: boolean
325-
:ivar tack: TACK extension presence (deprecated)
324+
:vartype ~.tack: boolean
325+
:ivar ~.tack: TACK extension presence (deprecated)
326326
327-
:vartype server_name: bytearray
328-
:ivar server_name: first host_name (type 0) present in SNI extension
327+
:vartype ~.server_name: bytearray
328+
:ivar ~.server_name: first host_name (type 0) present in SNI extension
329329
(deprecated)
330330
331331
:vartype extensions: list of :py:class:`TLSExtension`
@@ -1620,8 +1620,8 @@ class ClientKeyExchange(HandshakeMsg):
16201620
16211621
:vartype cipherSuite: int
16221622
:ivar cipherSuite: the cipher suite id used for the connection
1623-
:vartype version: tuple(int, int)
1624-
:ivar version: TLS protocol version used for the connection
1623+
:vartype ~.version: tuple(int, int)
1624+
:ivar ~.version: TLS protocol version used for the connection
16251625
:vartype srp_A: int
16261626
:ivar srp_A: SRP protocol client answer value
16271627
:vartype dh_Yc: int
@@ -2056,7 +2056,7 @@ class SessionTicketPayload(object):
20562056
This is the internal (meant to be encrypted) representation of server
20572057
state that is set to client in the NewSessionTicket message.
20582058
2059-
:ivar int version: implementation detail for forward compatibility
2059+
:ivar int ~.version: implementation detail for forward compatibility
20602060
:ivar bytearray master_secret: master secret for TLS 1.2-, resumption
20612061
master secret for TLS 1.3
20622062

tlslite/recordlayer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class RecordSocket(object):
3838
Socket wrapper for reading and writing TLS Records.
3939
4040
:ivar sock: wrapped socket
41-
:ivar version: version for the records to be encoded on the wire
41+
:ivar ~.version: version for the records to be encoded on the wire
4242
:ivar tls13record: flag to indicate that TLS 1.3 specific record limits
4343
should be used for received records
4444
:ivar int recv_record_limit: negotiated maximum size of record plaintext
@@ -272,7 +272,7 @@ class RecordLayer(object):
272272
"""
273273
Implementation of TLS record layer protocol
274274
275-
:ivar version: the TLS version to use (tuple encoded as on the wire)
275+
:ivar ~.version: the TLS version to use (tuple encoded as on the wire)
276276
:ivar sock: underlying socket
277277
:ivar client: whether the connection should use encryption
278278
:ivar handshake_finished: used in SSL2, True if handshake protocol is over

tlslite/session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ class Session(object):
4343
:vartype tackInHelloExt: bool
4444
:ivar tackInHelloExt: True if a TACK was presented via TLS Extension.
4545
46-
:vartype encryptThenMAC: bool
47-
:ivar encryptThenMAC: True if connection uses CBC cipher in
46+
:vartype ~.encryptThenMAC: bool
47+
:ivar ~.encryptThenMAC: True if connection uses CBC cipher in
4848
encrypt-then-MAC mode
4949
5050
:vartype appProto: bytearray

tlslite/tlsrecordlayer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ class TLSRecordLayer(object):
4848
Due to TLS session resumption, multiple connections can correspond
4949
to the same underlying session.
5050
51-
:vartype version: tuple
52-
:ivar version: The TLS version being used for this connection.
51+
:vartype ~.version: tuple
52+
:ivar ~.version: The TLS version being used for this connection.
5353
(3,0) means SSL 3.0, and (3,1) means TLS 1.0.
5454
5555
:vartype closed: bool
@@ -89,8 +89,8 @@ class TLSRecordLayer(object):
8989
attacker truncating the connection, and only if necessary to avoid
9090
spurious errors. The default is False.
9191
92-
:vartype encryptThenMAC: bool
93-
:ivar encryptThenMAC: Whether the connection uses the encrypt-then-MAC
92+
:vartype ~.encryptThenMAC: bool
93+
:ivar ~.encryptThenMAC: Whether the connection uses the encrypt-then-MAC
9494
construct for CBC cipher suites, will be False also if connection uses
9595
RC4 or AEAD.
9696

0 commit comments

Comments
 (0)