From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Thu, 21 Nov 2013 23:49:47 +0000 (-0500)
Subject: Merge branch 'fix_python2_sql_output'
X-Git-Tag: rel_0_6_1~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=83d0b8c4a4221771080b5688c8da7eb539612340;p=thirdparty%2Fsqlalchemy%2Falembic.git

Merge branch 'fix_python2_sql_output'

Conflicts:
	docs/build/changelog.rst
---

83d0b8c4a4221771080b5688c8da7eb539612340
diff --cc docs/build/changelog.rst
index 96ed7830,9f7b7153..a9ef46a3
--- a/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