8000 Make Connection.next_packet private · PyMySQL/PyMySQL@f919e2d · GitHub
[go: up one dir, main page]

Skip to content

Commit f919e2d

Browse files
committed
Make Connection.next_packet private
1 parent 0cffd55 commit f919e2d

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

pymysql/connections.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ def __del__(self):
726726
def autocommit(self, value):
727727
self.autocommit_mode = bool(value)
728728
current = self.get_autocommit()
729-
self.next_packet = 1
729+
self._next_packet = 1
730730
if value != current:
731731
self._send_autocommit_mode()
732732

@@ -816,15 +816,15 @@ def query(self, sql, unbuffered=False):
816816
"You may not close previous cursor.")
817817
# if DEBUG:
818818
# print("DEBUG: sending query:", sql)
819-
self.next_packet = 1
819+
self._next_packet = 1
820820
if isinstance(sql, text_type) and not (JYTHON or IRONPYTHON):
821821
if PY2:
822822
sql = sql.encode(self.encoding)
823823
else:
824824
sql = sql.encode(self.encoding, 'surrogateescape')
825825
self._execute_command(COMMAND.COM_QUERY, sql)
826826
self._affected_rows = self._read_query_result(unbuffered=unbuffered)
827-
self.next_packet = 1
827+
self._next_packet = 1
828828
return self._affected_rows
829829

830830
def next_result(self, unbuffered=False):
@@ -892,7 +892,7 @@ def connect(self, sock=None):
892892
sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
893893
self.socket = sock
894894
self._rfile = _makefile(sock, 'rb')
895-
self.next_packet = 0
895+
self._next_packet = 0
896896

897897
self._get_server_information()
898898
self._request_authentication()
@@ -938,11 +938,11 @@ def write_packet(self, data):
938938
addings its length and sequence number. Intended for use by plugins
939939
only.
940940
"""
941-
data = pack_int24(len(data)) + int2byte(self.next_packet) + data
941+
data = pack_int24(len(data)) + int2byte(self._next_packet) + data
942942
if DEBUG: dump_packet(data)
943943

944944
self._write_bytes(data)
945-
self.next_packet = (self.next_packet + 1) % 256
945+
self._next_packet = (self._next_packet + 1) % 256
946946

947947
def _read_packet(self, packet_type=MysqlPacket):
948948
"""Read an entire "mysql packet" in its entirety from the network
@@ -962,13 +962,13 @@ def _read_packet(self, packet_type=MysqlPacket):
962962
continue
963963
if bytes_to_read < MAX_PACKET_LEN:
964964
break
965-
if packet_number != self.next_packet:
965+
if packet_number != self._next_packet:
966966
pass
967967
#TODO: check sequence id
968968
#raise err.InternalError("Packet sequence number wrong - got %d expected %d" %
969-
# (packet_number, self.next_packet))
969+
# (packet_number, self._next_packet))
970970

971-
self.next_packet = (packet_number + 1) % 256
971+
self._next_packet = (packet_number + 1) % 256
972972
packet = packet_type(buff, self.encoding)
973973
packet.check_error()
974974
return packet
@@ -1037,7 +1037,7 @@ def _execute_command(self, command, sql):
10371037
self._write_bytes(prelude + sql[:chunk_size-1])
10381038
if DEBUG: dump_packet(prelude + sql)
10391039

1040-
self.next_packet = 1
1040+
self._next_packet = 1
10411041
if chunk_size < self.max_allowed_packet:
10421042
return
10431043

@@ -1053,7 +1053,7 @@ def _execute_command(self, command, sql):
10531053
if not sql and chunk_size < self.max_allowed_packet:
10541054
break
10551055
seq_id += 1
1056-
self.next_packet = seq_id%256
1056+
self._next_packet = seq_id % 256
10571057

10581058
def _request_authentication(self):
10591059
# https://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::HandshakeResponse

0 commit comments

Comments
 (0)
0