diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-21 15:10:51 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-03-21 15:10:51 -0400 |
| commit | 1447abc5347bee5b8611bebe1ae628b32674dc95 (patch) | |
| tree | d3afa456f705e9c0e37e265acbf9312308d6ccfc /lib/sqlalchemy/util | |
| parent | c09c21c9f31826e126b97d6318a9df66986af774 (diff) | |
| download | sqlalchemy-fix_mysqlconnector.tar.gz | |
- wip for #3336fix_mysqlconnector
Diffstat (limited to 'lib/sqlalchemy/util')
| -rw-r--r-- | lib/sqlalchemy/util/__init__.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/util/compat.py | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/util/__init__.py b/lib/sqlalchemy/util/__init__.py index d777d2e06..1ece5f6d4 100644 --- a/lib/sqlalchemy/util/__init__.py +++ b/lib/sqlalchemy/util/__init__.py @@ -12,7 +12,7 @@ from .compat import callable, cmp, reduce, \ binary_type, nested, \ quote_plus, with_metaclass, print_, itertools_filterfalse, u, ue, b,\ unquote_plus, unquote, b64decode, b64encode, byte_buffer, itertools_filter,\ - iterbytes, StringIO, inspect_getargspec, zip_longest + iterbytes, StringIO, inspect_getargspec, zip_longest, all_binary_types from ._collections import KeyedTuple, ImmutableContainer, immutabledict, \ Properties, OrderedProperties, ImmutableProperties, OrderedDict, \ diff --git a/lib/sqlalchemy/util/compat.py b/lib/sqlalchemy/util/compat.py index 5b6f691f1..048804629 100644 --- a/lib/sqlalchemy/util/compat.py +++ b/lib/sqlalchemy/util/compat.py @@ -65,6 +65,7 @@ if py3k: text_type = str int_types = int, iterbytes = iter + all_binary_types = (bytes, bytearray) def u(s): return s @@ -117,6 +118,7 @@ else: binary_type = str text_type = unicode int_types = int, long + all_binary_types = (str, ) def iterbytes(buf): return (ord(byte) for byte in buf) |