From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 12 Aug 2019 00:44:42 +0000 (-0400)
Subject: Use compat.string_types to check for visit name string
X-Git-Tag: rel_1_3_7~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a06cc2e84afd3f039cfb86b50928571dbdc86d;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Use compat.string_types to check for visit name string

Th visitor optimization looking for plain string needs to
accommodate for u"" in Python 2 due to the unicode_literals
future.

Fixes: #4800
Change-Id: I5e3136f2f2cbd5f24d89186b599f59ea2e7f1550
(cherry picked from commit 3a542005a5f38556dc45c5bc8f256a154ee72c8a)
---

diff --git a/lib/sqlalchemy/sql/visitors.py b/lib/sqlalchemy/sql/visitors.py
index c06c954596..0a3cb8c1cf 100644
--- a/lib/sqlalchemy/sql/visitors.py
+++ b/lib/sqlalchemy/sql/visitors.py
@@ -76,7 +76,8 @@ def _generate_dispatch(cls):
     """
     if "__visit_name__" in cls.__dict__:
         visit_name = cls.__visit_name__
-        if isinstance(visit_name, str):
+
+        if isinstance(visit_name, util.compat.string_types):
             # There is an optimization opportunity here because the
             # the string name of the class's __visit_name__ is known at
             # this early stage (import time) so it can be pre-constructed.