Skip to content

Commit d9b67a3

Browse files
methanemethane
authored
Code cleanup (#927)
* cleanup * 2to3 -f unicode * black
1 parent f9489ed commit d9b67a3

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎pymysql/converters.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -64,13 +64,13 @@ def escape_float(value, mapping=None):
6464

6565

6666
_escape_table = [chr(x) for x in range(128)]
67-
_escape_table[0] = u"\\0"
68-
_escape_table[ord("\\")] = u"\\\\"
69-
_escape_table[ord("\n")] = u"\\n"
70-
_escape_table[ord("\r")] = u"\\r"
71-
_escape_table[ord("\032")] = u"\\Z"
72-
_escape_table[ord('"')] = u'\\"'
73-
_escape_table[ord("'")] = u"\\'"
67+
_escape_table[0] = "\\0"
68+
_escape_table[ord("\\")] = "\\\\"
69+
_escape_table[ord("\n")] = "\\n"
70+
_escape_table[ord("\r")] = "\\r"
71+
_escape_table[ord("\032")] = "\\Z"
72+
_escape_table[ord('"')] = '\\"'
73+
_escape_table[ord("'")] = "\\'"
7474

7575

7676
def escape_string(value, mapping=None):

‎pymysql/protocol.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,31 +182,31 @@ def read_struct(self, fmt):
182182

183183
def is_ok_packet(self):
184184
# https://dev.mysql.com/doc/internals/en/packet-OK_Packet.html
185-
return self._data[0:1] == b"\0" and len(self._data) >= 7
185+
return self._data[0] == 0 and len(self._data) >= 7
186186

187187
def is_eof_packet(self):
188188
# http://dev.mysql.com/doc/internals/en/generic-response-packets.html#packet-EOF_Packet
189189
# Caution: \xFE may be LengthEncodedInteger.
190190
# If \xFE is LengthEncodedInteger header, 8bytes followed.
191-
return self._data[0:1] == b"\xfe" and len(self._data) < 9
191+
return self._data[0] == 0xFE and len(self._data) < 9
192192

193193
def is_auth_switch_request(self):
194194
# http://dev.mysql.com/doc/internals/en/connection-phase-packets.html#packet-Protocol::AuthSwitchRequest
195-
return self._data[0:1] == b"\xfe"
195+
return self._data[0] == 0xFE
196196

197197
def is_extra_auth_data(self):
198198
# https://dev.mysql.com/doc/internals/en/successful-authentication.html
199-
return self._data[0:1] == b"\x01"
199+
return self._data[0] == 1
200200

201201
def is_resultset_packet(self):
202-
field_count = ord(self._data[0:1])
202+
field_count = self._data[0]
203203
return 1 <= field_count <= 250
204204

205205
def is_load_local_packet(self):
206-
return self._data[0:1] == b"\xfb"
206+
return self._data[0] == 0xFB
207207

208208
def is_error_packet(self):
209-
return self._data[0:1] == b"\xff"
209+
return self._data[0] == 0xFF
210210

211211
def check_error(self):
212212
if self.is_error_packet():

‎pymysql/tests/test_basic.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def test_datatypes(self):
2929
123456789012,
3030
5.7,
3131
"hello'\" world",
32-
u"Espa\xc3\xb1ol",
32+
"Espa\xc3\xb1ol",
3333
"binary\x00data".encode(conn.encoding),
3434
datetime.date(1988, 2, 2),
3535
datetime.datetime(2014, 5, 15, 7, 45, 57),
@@ -147,9 +147,9 @@ def test_untyped(self):
147147
conn = self.connect()
148148
c = conn.cursor()
149149
c.execute("select null,''")
150-
self.assertEqual((None, u""), c.fetchone())
150+
self.assertEqual((None, ""), c.fetchone())
151151
c.execute("select '',null")
152-
self.assertEqual((u"", None), c.fetchone())
152+
self.assertEqual(("", None), c.fetchone())
153153

154154
def test_timedelta(self):
155155
""" test timedelta conversion """
@@ -300,7 +300,7 @@ def test_json(self):
300300
)
301301
cur = conn.cursor()
302302

303-
json_str = u'{"hello": "こんにちは"}'
303+
json_str = '{"hello": "こんにちは"}'
304304
cur.execute("INSERT INTO test_json (id, `json`) values (42, %s)", (json_str,))
305305
cur.execute("SELECT `json` from `test_json` WHERE `id`=42")
306306
res = cur.fetchone()[0]

‎pymysql/tests/test_connection.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,17 @@ class TestAuthentication(base.PyMySQLTestCase):
7070
del db["user"]
7171
cur.execute("SHOW PLUGINS")
7272
for r in cur:
73-
if (r[1], r[2]) != (u"ACTIVE", u"AUTHENTICATION"):
73+
if (r[1], r[2]) != ("ACTIVE", "AUTHENTICATION"):
7474
continue
75-
if r[3] == u"auth_socket.so" or r[0] == u"unix_socket":
75+
if r[3] == "auth_socket.so" or r[0] == "unix_socket":
7676
socket_plugin_name = r[0]
7777
socket_found = True
78-
elif r[3] == u"dialog_examples.so":
78+
elif r[3] == "dialog_examples.so":
7979
if r[0] == "two_questions":
8080
two_questions_found = True
8181
elif r[0] == "three_attempts":
8282
three_attempts_found = True
83-
elif r[0] == u"pam":
83+
elif r[0] == "pam":
8484
pam_found = True
8585
pam_plugin_name = r[3].split(".")[0]
8686
if pam_plugin_name == "auth_pam":
@@ -92,9 +92,9 @@ class TestAuthentication(base.PyMySQLTestCase):
9292
# https://mariadb.com/kb/en/mariadb/pam-authentication-plugin/
9393

9494
# Names differ but functionality is close
95-
elif r[0] == u"mysql_old_password":
95+
elif r[0] == "mysql_old_password":
9696
mysql_old_password_found = True
97-
elif r[0] == u"sha256_password":
97+
elif r[0] == "sha256_password":
9898
sha256_password_found = True
9999
# else:
100100
# print("plugin: %r" % r[0])

‎pymysql/tests/test_converters.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
class TestConverter(TestCase):
1010
def test_escape_string(self):
11-
self.assertEqual(converters.escape_string(u"foo\nbar"), u"foo\\nbar")
11+
self.assertEqual(converters.escape_string("foo\nbar"), "foo\\nbar")
1212

1313
def test_convert_datetime(self):
1414
expected = datetime.datetime(2007, 2, 24, 23, 6, 20)

‎pymysql/tests/test_issues.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@ def test_issue_15(self):
120120
c.execute("drop table if exists issue15")
121121
c.execute("create table issue15 (t varchar(32))")
122122
try:
123-
c.execute("insert into issue15 (t) values (%s)", (u"\xe4\xf6\xfc",))
123+
c.execute("insert into issue15 (t) values (%s)", ("\xe4\xf6\xfc",))
124124
c.execute("select t from issue15")
125-
self.assertEqual(u"\xe4\xf6\xfc", c.fetchone()[0])
125+
self.assertEqual("\xe4\xf6\xfc", c.fetchone()[0])
126126
finally:
127127
c.execute("drop table issue15")
128128

@@ -189,12 +189,12 @@ def test_issue_34(self):
189189
def test_issue_33(self):
190190
conn = pymysql.connect(charset="utf8", **self.databases[0])
191191
self.safe_create_table(
192-
conn, u"hei\xdfe", u"create table hei\xdfe (name varchar(32))"
192+
conn, "hei\xdfe", "create table hei\xdfe (name varchar(32))"
193193
)
194194
c = conn.cursor()
195-
c.execute(u"insert into hei\xdfe (name) values ('Pi\xdfata')")
196-
c.execute(u"select name from hei\xdfe")
197-
self.assertEqual(u"Pi\xdfata", c.fetchone()[0])
195+
c.execute("insert into hei\xdfe (name) values ('Pi\xdfata')")
196+
c.execute("select name from hei\xdfe")
197+
self.assertEqual("Pi\xdfata", c.fetchone()[0])
198198

199199
@pytest.mark.skip("This test requires manual intervention")
200200
def test_issue_35(self):
@@ -408,18 +408,18 @@ def test_issue_321(self):
408408
)
409409
sql_select = "select * from issue321 where " "value_1 in %s and value_2=%s"
410410
data = [
411-
[(u"a",), u"\u0430"],
412-
[[u"b"], u"\u0430"],
413-
{"value_1": [[u"c"]], "value_2": u"\u0430"},
411+
[("a",), "\u0430"],
412+
[["b"], "\u0430"],
413+
{"value_1": [["c"]], "value_2": "\u0430"},
414414
]
415415
cur = conn.cursor()
416416
self.assertEqual(cur.execute(sql_insert, data[0]), 1)
417417
self.assertEqual(cur.execute(sql_insert, data[1]), 1)
418418
self.assertEqual(cur.execute(sql_dict_insert, data[2]), 1)
419-
self.assertEqual(cur.execute(sql_select, [(u"a", u"b", u"c"), u"\u0430"]), 3)
420-
self.assertEqual(cur.fetchone(), (u"a", u"\u0430"))
421-
self.assertEqual(cur.fetchone(), (u"b", u"\u0430"))
422-
self.assertEqual(cur.fetchone(), (u"c", u"\u0430"))
419+
self.assertEqual(cur.execute(sql_select, [("a", "b", "c"), "\u0430"]), 3)
420+
self.assertEqual(cur.fetchone(), ("a", "\u0430"))
421+
self.assertEqual(cur.fetchone(), ("b", "\u0430"))
422+
self.assertEqual(cur.fetchone(), ("c", "\u0430"))
423423

424424
def test_issue_364(self):
425425
""" Test mixed unicode/binary arguments in executemany. """
@@ -432,8 +432,8 @@ def test_issue_364(self):
432432
)
433433

434434
sql = "insert into issue364 (value_1, value_2) values (_binary %s, %s)"
435-
usql = u"insert into issue364 (value_1, value_2) values (_binary %s, %s)"
436-
values = [pymysql.Binary(b"\x00\xff\x00"), u"\xe4\xf6\xfc"]
435+
usql = "insert into issue364 (value_1, value_2) values (_binary %s, %s)"
436+
values = [pymysql.Binary(b"\x00\xff\x00"), "\xe4\xf6\xfc"]
437437

438438
# test single insert and select
439439
cur = conn.cursor()

0 commit comments

Comments
 (0)