8000 Release/0.7 by methane · Pull Request #413 · PyMySQL/PyMySQL · GitHub
[go: up one dir, main page]

Skip to content

Release/0.7 #413

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 10, 2016
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
methane committed Jan 10, 2016
commit 9888906a6da3e9c6694edfd6703d0d6cf141d965
4 changes: 2 additions & 2 deletions pymysql/tests/test_connection.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import datetime
import decimal
import sys
import time
import unittest2
import pymysql
from pymysql.tests import base
from pymysql._compat import text_type


class TempUser:
Expand Down Expand Up @@ -534,7 +534,7 @@ def test_escape_fallback_encoder(self):
class Custom(str):
pass

mapping = {pymysql.text_type: pymysql.escape_string}
mapping = {text_type: pymysql.escape_string}
self.assertEqual(con.escape(Custom('foobar'), mapping), "'foobar'")

def test_escape_no_default(self):
Expand Down
0