openstack/deb-python-pymysql
Code Issues Proposed changes

Remove unnecessary PY2 check and replace unicode with text_type.

Browse Source
This commit is contained in:
Hanno Schlichting
2015-08-11 22:10:21 +02:00
parent 8ba8362398
commit 3eeee0efe3
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pymysql/cursors.py
View File

@@ -95,9 +95,7 @@ class Cursor(object):
return self._nextset(False) return self._nextset(False)
def _ensure_bytes(self, x, encoding=None): def _ensure_bytes(self, x, encoding=None):
if not PY2: if isinstance(x, text_type):
return x
if isinstance(x, unicode):
x = x.encode(encoding) x = x.encode(encoding)
elif isinstance(x, (tuple, list)): elif isinstance(x, (tuple, list)):
x = type(x)(self._ensure_bytes(v, encoding=encoding) for v in x) x = type(x)(self._ensure_bytes(v, encoding=encoding) for v in x)