diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-03 13:13:16 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-06-03 13:13:16 -0400 |
| commit | 74c98bf182a1cac1ca1837da69e1c0550beaaab5 (patch) | |
| tree | 4815d198d2aa4a6497330fb5d81e53bf4acfbb2d /lib/sqlalchemy/testing/warnings.py | |
| parent | ff399ac75074916045410cedae72489cb60e8b50 (diff) | |
| parent | c2a158c137ee07a146f02e5ee89ec42e486c6a37 (diff) | |
| download | sqlalchemy-74c98bf182a1cac1ca1837da69e1c0550beaaab5.tar.gz | |
Merge branch 'master' into ticket_1068
Diffstat (limited to 'lib/sqlalchemy/testing/warnings.py')
| -rw-r--r-- | lib/sqlalchemy/testing/warnings.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py index 41f3dbfed..6193acd88 100644 --- a/lib/sqlalchemy/testing/warnings.py +++ b/lib/sqlalchemy/testing/warnings.py @@ -10,7 +10,7 @@ def testing_warn(msg, stacklevel=3): filename = "sqlalchemy.testing.warnings" lineno = 1 - if isinstance(msg, basestring): + if isinstance(msg, util.string_types): warnings.warn_explicit(msg, sa_exc.SAWarning, filename, lineno) else: warnings.warn_explicit(msg, filename, lineno) |