Merge branch 'fix_python2_sql_output'

Conflicts:
	docs/build/changelog.rst

diff --cc alembic/compat.py
Simple merge

diff --cc docs/build/changelog.rst
index 96ed78303eb83570bb9c3129bc619fd309f8109d,9f7b7153f4814db9bdff6abe18eecd28c2d34783..a9ef46a3bb870b6dd1739e425eb40327285b7a00
--- 1/docs/build/changelog.rst
--- 2/docs/build/changelog.rst
+++ b/docs/build/changelog.rst
@@@ -7,15 -7,16 +7,25 @@@ Changelo
      :version: 0.6.1
      :released: no release date
  
 +    .. change::
 +      :tags: bug
 +      :tickets: 135
 +
 +      Fixed the output wrapping for Alembic message output, so that
 +      we either get the terminal width for "pretty printing" with
 +      indentation, or if not we just output the text as is; in any
 +      case the text won't be wrapped too short.
 +
+     .. change::
+       :tags: bug
+       :pullreq: 9
+ 
+       Fixes to Py3k in-place compatibity regarding output encoding and related;
+       the use of the new io.* package introduced some incompatibilities on Py2k.
+       These should be resolved, due to the introduction of new adapter types
+       for translating from io.* to Py2k file types, StringIO types.
+       Thanks to Javier Santacruz for help with this.
+ 
      .. change::
        :tags: bug
        :tickets: 145