- Fixed bug in "to_list" conversion where a single bytes object

would be turned into a list of individual characters.  This would
impact among other things using the :meth:`.Query.get` method
on a primary key that's a bytes object.
fixes #3660

2 files changed, 6 insertions, 2 deletions

diff --git a/lib/sqlalchemy/util/_collections.py b/lib/sqlalchemy/util/_collections.py
index ed1a3e471..c29b81f6a 100644
--- a/lib/sqlalchemy/util/_collections.py
+++ b/lib/sqlalchemy/util/_collections.py
@@ -10,7 +10,8 @@
 from __future__ import absolute_import
 import weakref
 import operator
-from .compat import threading, itertools_filterfalse, string_types
+from .compat import threading, itertools_filterfalse, string_types, \
+    binary_types
 from . import py2k
 import types
 import collections
@@ -794,7 +795,8 @@ def coerce_generator_arg(arg):
 def to_list(x, default=None):
     if x is None:
         return default
-    if not isinstance(x, collections.Iterable) or isinstance(x, string_types):
+    if not isinstance(x, collections.Iterable) or \
+            isinstance(x, string_types + binary_types):
         return [x]
     elif isinstance(x, list):
         return x
diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py
index 99b5177b5..ee4a20f9b 100644
--- a/lib/sqlalchemy/util/compat.py
+++ b/lib/sqlalchemy/util/compat.py
@@ -62,6 +62,7 @@ if py3k:
         )
 
     string_types = str,
+    binary_types = bytes,
     binary_type = bytes
     text_type = str
     int_types = int,
@@ -115,6 +116,7 @@ else:
     from cStringIO import StringIO as byte_buffer
 
     string_types = basestring,
+    binary_types = bytes,
     binary_type = str
     text_type = unicode
     int_types = int, long