diff options
| author | Andrey Grozin <grozin@gentoo.org> | 2016-02-23 19:05:27 +0600 |
|---|---|---|
| committer | Andrey Grozin <grozin@gentoo.org> | 2016-02-23 19:05:27 +0600 |
| commit | a625adf7fef166089c66cb045cd026b1e9ceb7aa (patch) | |
| tree | f70a3380eb347c8ffbe97c5c744c194ef1e7e696 | |
| parent | 060ec4b2080e5a215783d217b42f1eb51ca6fe01 (diff) | |
| download | gentoo-a625adf7fef166089c66cb045cd026b1e9ceb7aa.tar.gz gentoo-a625adf7fef166089c66cb045cd026b1e9ceb7aa.tar.xz | |
dev-python/colorama: upstream fix
https://github.com/tartley/colorama/commit/1244a00ae1accfeca3b4b1a85a3b718a920dd6bd
Package-Manager: portage-2.2.27
| -rw-r--r-- | dev-python/colorama/colorama-0.3.6.ebuild | 4 | ||||
| -rw-r--r-- | dev-python/colorama/files/colorama-0.3.6.patch | 32 |
2 files changed, 35 insertions, 1 deletions
diff --git a/dev-python/colorama/colorama-0.3.6.ebuild b/dev-python/colorama/colorama-0.3.6.ebuild index ae0dd9954b9..7cc88846d36 100644 --- a/dev-python/colorama/colorama-0.3.6.ebuild +++ b/dev-python/colorama/colorama-0.3.6.ebuild @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) @@ -19,6 +19,8 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="examples" +PATCHES=( "${FILESDIR}"/${P}.patch ) + python_install_all() { use examples && local EXAMPLES=( demos/. ) distutils-r1_python_install_all diff --git a/dev-python/colorama/files/colorama-0.3.6.patch b/dev-python/colorama/files/colorama-0.3.6.patch new file mode 100644 index 00000000000..65a9476d175 --- /dev/null +++ b/dev-python/colorama/files/colorama-0.3.6.patch @@ -0,0 +1,32 @@ +diff -r -U2 colorama-0.3.6.orig/colorama/ansitowin32.py colorama-0.3.6/colorama/ansitowin32.py +--- colorama-0.3.6.orig/colorama/ansitowin32.py 2015-12-14 09:09:52.000000000 +0100 ++++ colorama-0.3.6/colorama/ansitowin32.py 2016-02-23 13:52:37.230415139 +0100 +@@ -14,4 +14,8 @@ + + ++def is_stream_closed(stream): ++ return not hasattr(stream, 'closed') or stream.closed ++ ++ + def is_a_tty(stream): + return hasattr(stream, 'isatty') and stream.isatty() +@@ -65,10 +69,10 @@ + # should we strip ANSI sequences from our output? + if strip is None: +- strip = conversion_supported or (not wrapped.closed and not is_a_tty(wrapped)) ++ strip = conversion_supported or (not is_stream_closed(wrapped) and not is_a_tty(wrapped)) + self.strip = strip + + # should we should convert ANSI sequences into win32 calls? + if convert is None: +- convert = conversion_supported and not wrapped.closed and is_a_tty(wrapped) ++ convert = conversion_supported and not is_stream_closed(wrapped) and is_a_tty(wrapped) + self.convert = convert + +@@ -146,5 +150,5 @@ + if self.convert: + self.call_win32('m', (0,)) +- elif not self.strip and not self.wrapped.closed: ++ elif not self.strip and not is_stream_closed(self.wrapped): + self.wrapped.write(Style.RESET_ALL) + |